diff --git a/.goosehints b/.goosehints
deleted file mode 100644
index 8ce437dc..00000000
--- a/.goosehints
+++ /dev/null
@@ -1,7 +0,0 @@
-- always compile the project after you're done to make sure that everything still works.
-- reuse as much code as you can, avoid code duplication. 
-- if files get too long (longer than 300ish lines) tend to create new files when you write code with a new responsibility. we want to keep the files relatively short and keep the code easier to maintain.
-- design all features so that it looks incredibly good, Apple-like high quality app design with great UX and professional and useful design that makes it easy to use as a person working at a checkout. Apple-like UI design patterns.
-- unless for logging purposes, avoid the adding hard-coded string literals to the codebase: create localized labels instead.
-- always provide documentation for any and all new or modified methods and classes
-- do not use FQN (Fully Qualified Names). always prefer imports on top of the file and -if necessary- aliases.
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ac1eaf87..371e88bb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -95,6 +95,7 @@ dependencies {
     implementation("com.google.android.material:material:1.11.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.gridlayout:gridlayout:1.0.0")
+    implementation("androidx.viewpager2:viewpager2:1.0.0")
     implementation("androidx.navigation:navigation-fragment-ktx:2.7.6")
     implementation("androidx.navigation:navigation-ui-ktx:2.7.6")
     
diff --git a/app/src/main/java/com/electricdreams/numo/feature/autowithdraw/AutoWithdrawSettingsActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/autowithdraw/AutoWithdrawSettingsActivity.kt
index 49d6edae..b5d0e275 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/autowithdraw/AutoWithdrawSettingsActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/autowithdraw/AutoWithdrawSettingsActivity.kt
@@ -2,7 +2,6 @@ package com.electricdreams.numo.feature.autowithdraw
 
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
-import android.animation.ValueAnimator
 import android.content.Intent
 import android.os.Bundle
 import android.text.Editable
@@ -33,6 +32,8 @@ import com.electricdreams.numo.core.cashu.CashuWalletManager
 import com.electricdreams.numo.core.model.Amount
 import com.electricdreams.numo.core.util.MintManager
 import com.electricdreams.numo.feature.settings.WithdrawLightningActivity
+import com.electricdreams.numo.ui.components.EmptyStateHelper
+import com.electricdreams.numo.ui.components.LightningStrikeView
 import com.electricdreams.numo.ui.components.MintSelectionBottomSheet
 import com.electricdreams.numo.ui.util.DialogHelper
 import com.google.android.material.slider.Slider
@@ -56,12 +57,16 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
     private lateinit var autoWithdrawManager: AutoWithdrawManager
 
     // Hero section
-    private lateinit var heroIcon: ImageView
-    private lateinit var heroIconContainer: FrameLayout
+    private lateinit var heroBg: FrameLayout
+    private lateinit var heroBolt: ImageView
+    private lateinit var heroBoltFade: View
     private lateinit var statusContainer: LinearLayout
     private lateinit var statusDot: View
     private lateinit var statusText: TextView
 
+    // Toggle icon
+    private lateinit var toggleIcon: ImageView
+
     // Settings controls
     private lateinit var enableSwitch: SwitchCompat
     private lateinit var enableToggleRow: LinearLayout
@@ -72,10 +77,13 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
 
     // History section
     private lateinit var historyCard: CardView
-    private lateinit var historyEmptyContainer: LinearLayout
+    private lateinit var historyEmptyContainer: View
     private lateinit var historyRecyclerView: RecyclerView
     private lateinit var seeAllButton: TextView
 
+    // Auto-withdraw config container (Destination + Trigger Settings)
+    private lateinit var configContainer: LinearLayout
+
     // Manual withdraw
     private lateinit var manualWithdrawRow: LinearLayout
     
@@ -83,7 +91,6 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
     private lateinit var mintManager: MintManager
 
     private var isUpdatingUI = false
-    private var iconAnimator: ObjectAnimator? = null
     
     // Current threshold value (in sats)
     private var currentThreshold: Long = AutoWithdrawSettingsManager.DEFAULT_THRESHOLD_SATS
@@ -103,9 +110,6 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
         setupListeners()
         loadSettings()
         loadHistory()
-        
-        // Start entrance animations
-        startEntranceAnimations()
     }
 
     private fun initViews() {
@@ -115,12 +119,16 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
         }
 
         // Hero section
-        heroIcon = findViewById(R.id.hero_icon)
-        heroIconContainer = findViewById(R.id.icon_container)
+        heroBg = findViewById(R.id.hero_bg)
+        heroBolt = findViewById(R.id.hero_bolt)
+        heroBoltFade = findViewById(R.id.hero_bolt_fade)
         statusContainer = findViewById(R.id.status_container)
         statusDot = findViewById(R.id.status_dot)
         statusText = findViewById(R.id.status_text)
 
+        // Toggle icon
+        toggleIcon = findViewById(R.id.toggle_icon)
+
         // Main toggle
         enableSwitch = findViewById(R.id.enable_switch)
         enableToggleRow = findViewById(R.id.enable_toggle_row)
@@ -137,6 +145,9 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
         historyRecyclerView = findViewById(R.id.history_recycler_view)
         seeAllButton = findViewById(R.id.see_all_button)
         
+        // Config container (Destination + Trigger Settings)
+        configContainer = findViewById(R.id.auto_withdraw_config_container)
+
         // Manual withdraw
         manualWithdrawRow = findViewById(R.id.manual_withdraw_row)
 
@@ -154,8 +165,12 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
             if (!isUpdatingUI) {
                 settingsManager.setGloballyEnabled(isChecked)
                 updateStatusIndicator(isChecked)
-                updateConfigFieldsEnabled(isChecked)
+                updateHeroGradient(isChecked, animate = true)
+                animateConfigContainer(isChecked)
                 animateStatusChange(isChecked)
+                if (isChecked) {
+                    playLightningStrike()
+                }
             }
         }
 
@@ -284,7 +299,8 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
         val enabled = settingsManager.isGloballyEnabled()
         enableSwitch.isChecked = enabled
         updateStatusIndicator(enabled)
-        updateConfigFieldsEnabled(enabled)
+        updateHeroGradient(enabled, animate = false)
+        configContainer.visibility = if (enabled) View.VISIBLE else View.GONE
 
         lightningAddressInput.setText(settingsManager.getDefaultLightningAddress())
         
@@ -312,6 +328,29 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
         }
     }
 
+    private fun updateHeroGradient(enabled: Boolean, animate: Boolean) {
+        val gradientRes = if (enabled) R.drawable.bg_hero_gradient_active else R.drawable.bg_hero_gradient_green
+        val fadeRes = if (enabled) R.drawable.bg_hero_bolt_fade_active else R.drawable.bg_hero_bolt_fade_green
+
+        heroBg.setBackgroundResource(gradientRes)
+        val boltColor = if (enabled) R.color.color_bitcoin_orange else R.color.color_success_green
+        heroBolt.setColorFilter(ContextCompat.getColor(this, boltColor))
+        heroBoltFade.setBackgroundResource(fadeRes)
+
+        // Toggle row icon
+        toggleIcon.setColorFilter(ContextCompat.getColor(this, R.color.color_icon_secondary))
+    }
+
+    private fun playLightningStrike() {
+        val root = findViewById<ViewGroup>(R.id.root_layout)
+        val strike = LightningStrikeView(this)
+        root.addView(strike, ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        ))
+        strike.strike()
+    }
+
     private fun animateStatusChange(enabled: Boolean) {
         // Pulse animation on status container
         val scaleX = ObjectAnimator.ofFloat(statusContainer, "scaleX", 1f, 1.1f, 1f)
@@ -324,50 +363,43 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
             start()
         }
 
-        // Icon pulse
-        if (enabled) {
-            startIconPulseAnimation()
-        } else {
-            stopIconPulseAnimation()
-        }
     }
 
-    private fun startIconPulseAnimation() {
-        iconAnimator?.cancel()
-        
-        iconAnimator = ObjectAnimator.ofFloat(heroIconContainer, "alpha", 1f, 0.6f, 1f).apply {
-            duration = 1500
-            repeatCount = ValueAnimator.INFINITE
-            interpolator = AccelerateDecelerateInterpolator()
-            start()
+    private fun animateConfigContainer(show: Boolean) {
+        if (show) {
+            configContainer.visibility = View.VISIBLE
+            configContainer.alpha = 0f
+            configContainer.translationY = -20f
+            configContainer.animate()
+                .alpha(1f)
+                .translationY(0f)
+                .setDuration(250)
+                .setInterpolator(AccelerateDecelerateInterpolator())
+                .start()
+        } else {
+            configContainer.animate()
+                .alpha(0f)
+                .translationY(-20f)
+                .setDuration(200)
+                .setInterpolator(AccelerateDecelerateInterpolator())
+                .withEndAction {
+                    configContainer.visibility = View.GONE
+                }
+                .start()
         }
     }
 
-    private fun stopIconPulseAnimation() {
-        iconAnimator?.cancel()
-        heroIconContainer.alpha = 1f
-    }
-
-    private fun updateConfigFieldsEnabled(enabled: Boolean) {
-        val alpha = if (enabled) 1f else 0.5f
-        
-        // Animate alpha change
-        lightningAddressInput.animate().alpha(alpha).setDuration(200).start()
-        thresholdDisplay.animate().alpha(alpha).setDuration(200).start()
-        percentageSlider.animate().alpha(alpha).setDuration(200).start()
-        percentageBadge.animate().alpha(alpha).setDuration(200).start()
-        
-        lightningAddressInput.isEnabled = enabled
-        thresholdDisplay.isEnabled = enabled
-        thresholdDisplay.isClickable = enabled
-        percentageSlider.isEnabled = enabled
-    }
-
     private fun loadHistory() {
         val history = autoWithdrawManager.getHistory()
 
         if (history.isEmpty()) {
             historyEmptyContainer.visibility = View.VISIBLE
+            EmptyStateHelper.bind(
+                historyEmptyContainer,
+                R.drawable.ic_history,
+                getString(R.string.auto_withdraw_history_empty_title),
+                getString(R.string.auto_withdraw_history_empty_subtitle)
+            )
             historyRecyclerView.visibility = View.GONE
             seeAllButton.visibility = View.GONE
         } else {
@@ -381,62 +413,6 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
         }
     }
 
-    private fun startEntranceAnimations() {
-        // Hero card slide in
-        val heroCard: CardView = findViewById(R.id.hero_card)
-        heroCard.alpha = 0f
-        heroCard.translationY = -50f
-        heroCard.animate()
-            .alpha(1f)
-            .translationY(0f)
-            .setDuration(400)
-            .setInterpolator(AccelerateDecelerateInterpolator())
-            .start()
-
-        // Icon bounce
-        heroIconContainer.scaleX = 0f
-        heroIconContainer.scaleY = 0f
-        heroIconContainer.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .setStartDelay(200)
-            .setDuration(500)
-            .setInterpolator(OvershootInterpolator(2f))
-            .start()
-
-        // Status pill fade
-        statusContainer.alpha = 0f
-        statusContainer.animate()
-            .alpha(1f)
-            .setStartDelay(400)
-            .setDuration(300)
-            .start()
-
-        // Cards stagger in
-        val toggleCard: CardView = findViewById(R.id.toggle_card)
-        animateCardEntrance(toggleCard, 100)
-        
-        val manualWithdrawCard: CardView = findViewById(R.id.manual_withdraw_card)
-        animateCardEntrance(manualWithdrawCard, 200)
-        
-        // If auto-withdraw is enabled, start icon animation
-        if (settingsManager.isGloballyEnabled()) {
-            heroIconContainer.postDelayed({ startIconPulseAnimation() }, 800)
-        }
-    }
-
-    private fun animateCardEntrance(card: View, delay: Long) {
-        card.alpha = 0f
-        card.translationY = 30f
-        card.animate()
-            .alpha(1f)
-            .translationY(0f)
-            .setStartDelay(delay)
-            .setDuration(350)
-            .setInterpolator(AccelerateDecelerateInterpolator())
-            .start()
-    }
-
     override fun onResume() {
         super.onResume()
         // Refresh history when returning to activity (e.g., after completing a withdrawal)
@@ -445,7 +421,6 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
 
     override fun onDestroy() {
         super.onDestroy()
-        iconAnimator?.cancel()
     }
 
     /**
@@ -461,6 +436,7 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
         inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
             val iconContainer: FrameLayout = view.findViewById(R.id.icon_container)
             val statusIcon: ImageView = view.findViewById(R.id.status_icon)
+            val statusBadgeIcon: FrameLayout = view.findViewById(R.id.status_badge_icon_container)
             val amountText: TextView = view.findViewById(R.id.amount_text)
             val addressText: TextView = view.findViewById(R.id.address_text)
             val mintText: TextView = view.findViewById(R.id.mint_text)
@@ -504,19 +480,18 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
             // Status styling
             when (entry.status) {
                 WithdrawHistoryEntry.STATUS_COMPLETED -> {
-                    holder.statusIcon.setImageResource(R.drawable.ic_check)
-                    holder.statusIcon.setColorFilter(ContextCompat.getColor(this@AutoWithdrawSettingsActivity, R.color.color_success_green))
-                    holder.iconContainer.backgroundTintList = ContextCompat.getColorStateList(this@AutoWithdrawSettingsActivity, R.color.color_bg_secondary)
-                    holder.statusBadge.text = getString(R.string.auto_withdraw_status_completed)
-                    holder.statusBadge.setTextColor(ContextCompat.getColor(this@AutoWithdrawSettingsActivity, R.color.color_success_green))
-                    holder.statusBadge.background = ContextCompat.getDrawable(this@AutoWithdrawSettingsActivity, R.drawable.bg_status_pill_success)
+                    holder.statusIcon.setImageResource(R.drawable.ic_arrow_up_send)
+                    holder.statusIcon.setColorFilter(ContextCompat.getColor(this@AutoWithdrawSettingsActivity, R.color.color_text_primary))
+                    holder.statusBadgeIcon.visibility = View.VISIBLE
+                    holder.statusBadge.visibility = View.GONE
                     holder.expandIndicator.visibility = View.GONE
                     holder.errorContainer.visibility = View.GONE
                 }
                 WithdrawHistoryEntry.STATUS_PENDING -> {
                     holder.statusIcon.setImageResource(R.drawable.ic_pending)
                     holder.statusIcon.setColorFilter(ContextCompat.getColor(this@AutoWithdrawSettingsActivity, R.color.color_warning))
-                    holder.iconContainer.backgroundTintList = ContextCompat.getColorStateList(this@AutoWithdrawSettingsActivity, R.color.color_bg_secondary)
+                    holder.statusBadgeIcon.visibility = View.GONE
+                    holder.statusBadge.visibility = View.VISIBLE
                     holder.statusBadge.text = getString(R.string.auto_withdraw_status_pending)
                     holder.statusBadge.setTextColor(ContextCompat.getColor(this@AutoWithdrawSettingsActivity, R.color.color_warning))
                     holder.statusBadge.background = ContextCompat.getDrawable(this@AutoWithdrawSettingsActivity, R.drawable.bg_status_pill_pending)
@@ -526,7 +501,8 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
                 WithdrawHistoryEntry.STATUS_FAILED -> {
                     holder.statusIcon.setImageResource(R.drawable.ic_close)
                     holder.statusIcon.setColorFilter(ContextCompat.getColor(this@AutoWithdrawSettingsActivity, R.color.color_error))
-                    holder.iconContainer.backgroundTintList = ContextCompat.getColorStateList(this@AutoWithdrawSettingsActivity, R.color.color_bg_secondary)
+                    holder.statusBadgeIcon.visibility = View.GONE
+                    holder.statusBadge.visibility = View.VISIBLE
                     holder.statusBadge.text = getString(R.string.auto_withdraw_status_failed)
                     holder.statusBadge.setTextColor(ContextCompat.getColor(this@AutoWithdrawSettingsActivity, R.color.color_error))
                     holder.statusBadge.background = ContextCompat.getDrawable(this@AutoWithdrawSettingsActivity, R.drawable.bg_status_pill_error)
@@ -589,13 +565,6 @@ class AutoWithdrawSettingsActivity : AppCompatActivity() {
                 holder.expandIndicator.setImageResource(R.drawable.ic_chevron_down)
             }
 
-            // Animate item appearance
-            holder.itemView.alpha = 0f
-            holder.itemView.animate()
-                .alpha(1f)
-                .setStartDelay((position * 50).toLong())
-                .setDuration(200)
-                .start()
         }
         
         private fun toggleExpand(entryId: String, holder: ViewHolder) {
diff --git a/app/src/main/java/com/electricdreams/numo/feature/baskets/BasketNamesSettingsActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/baskets/BasketNamesSettingsActivity.kt
index 9619ba35..5ca5a305 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/baskets/BasketNamesSettingsActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/baskets/BasketNamesSettingsActivity.kt
@@ -12,6 +12,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.electricdreams.numo.R
+import com.electricdreams.numo.ui.components.EmptyStateHelper
 
 /**
  * Settings activity for configuring preset basket names.
@@ -30,7 +31,7 @@ class BasketNamesSettingsActivity : AppCompatActivity() {
     private lateinit var namesHeader: TextView
     private lateinit var namesCard: LinearLayout
     private lateinit var namesList: LinearLayout
-    private lateinit var emptyState: LinearLayout
+    private lateinit var emptyState: View
     private lateinit var addNameButton: View
     private lateinit var clearAllButton: View
     
@@ -74,7 +75,15 @@ class BasketNamesSettingsActivity : AppCompatActivity() {
             namesHeader.visibility = View.GONE
             namesCard.visibility = View.GONE
             emptyState.visibility = View.VISIBLE
+            EmptyStateHelper.bind(
+                emptyState,
+                R.drawable.ic_label,
+                getString(R.string.basket_names_settings_empty_title),
+                getString(R.string.basket_names_settings_empty_subtitle),
+                "+ Add Name"
+            ) { showAddNameDialog() }
             clearAllButton.visibility = View.GONE
+            addNameButton.visibility = View.GONE
         } else {
             // Show names list
             namesHeader.visibility = View.VISIBLE
@@ -94,10 +103,10 @@ class BasketNamesSettingsActivity : AppCompatActivity() {
                     addDivider()
                 }
             }
+
+            // Show add button only when items exist and can add more
+            addNameButton.visibility = if (basketNamesManager.canAddMore()) View.VISIBLE else View.GONE
         }
-        
-        // Update add button visibility
-        addNameButton.visibility = if (basketNamesManager.canAddMore()) View.VISIBLE else View.GONE
     }
     
     private fun bindNameItem(view: View, index: Int, name: String, totalCount: Int) {
diff --git a/app/src/main/java/com/electricdreams/numo/feature/history/PaymentsHistoryActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/history/PaymentsHistoryActivity.kt
index e0a968ca..0e8ab157 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/history/PaymentsHistoryActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/history/PaymentsHistoryActivity.kt
@@ -26,6 +26,7 @@ import com.electricdreams.numo.core.model.Amount
 import com.electricdreams.numo.core.util.CurrencyManager
 import com.electricdreams.numo.core.worker.BitcoinPriceWorker
 import com.electricdreams.numo.databinding.ActivityHistoryBinding
+import com.electricdreams.numo.ui.components.EmptyStateHelper
 import com.electricdreams.numo.feature.autowithdraw.AutoWithdrawManager
 import com.electricdreams.numo.feature.autowithdraw.WithdrawHistoryEntry
 import com.electricdreams.numo.payment.PaymentIntentFactory
@@ -349,7 +350,15 @@ class PaymentsHistoryActivity : AppCompatActivity() {
         adapter.setEntries(currentHistoryList)
 
         val isEmpty = currentHistoryList.isEmpty()
-        binding.emptyView.visibility = if (isEmpty) View.VISIBLE else View.GONE
+        binding.emptyView.root.visibility = if (isEmpty) View.VISIBLE else View.GONE
+        if (isEmpty) {
+            EmptyStateHelper.bind(
+                binding.emptyView.root,
+                R.drawable.ic_receipt,
+                "No Payments Yet",
+                "Payment history will appear here once you start accepting payments"
+            )
+        }
     }
 
     private fun clearAllHistory() {
diff --git a/app/src/main/java/com/electricdreams/numo/feature/history/TokenHistoryActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/history/TokenHistoryActivity.kt
index d7ce7a10..8bf6aa99 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/history/TokenHistoryActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/history/TokenHistoryActivity.kt
@@ -9,6 +9,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.electricdreams.numo.feature.enableEdgeToEdgeWithPill
 import com.electricdreams.numo.R
+import com.electricdreams.numo.ui.components.EmptyStateHelper
 import com.electricdreams.numo.core.data.model.TokenHistoryEntry
 import com.electricdreams.numo.databinding.ActivityHistoryBinding
 import com.electricdreams.numo.ui.adapter.TokenHistoryAdapter
@@ -59,7 +60,15 @@ class TokenHistoryActivity : AppCompatActivity() {
         adapter.setEntries(history)
 
         val isEmpty = history.isEmpty()
-        binding.emptyView.visibility = if (isEmpty) View.VISIBLE else View.GONE
+        binding.emptyView.root.visibility = if (isEmpty) View.VISIBLE else View.GONE
+        if (isEmpty) {
+            EmptyStateHelper.bind(
+                binding.emptyView.root,
+                R.drawable.ic_receipt,
+                "No Tokens Yet",
+                "Cashu token history will appear here"
+            )
+        }
     }
 
     private fun showClearHistoryConfirmation() {
diff --git a/app/src/main/java/com/electricdreams/numo/feature/items/ItemListActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/items/ItemListActivity.kt
index 28cffb22..c453d6df 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/items/ItemListActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/items/ItemListActivity.kt
@@ -45,7 +45,6 @@ class ItemListActivity : AppCompatActivity() {
     private lateinit var bottomActions: LinearLayout
     private lateinit var fabAddItem: ImageButton
     private lateinit var doneReorderButton: ImageButton
-    private lateinit var headerDivider: View
     private lateinit var topBar: View
     private lateinit var adapter: ItemAdapter
     private lateinit var itemTouchHelper: ItemTouchHelper
@@ -111,7 +110,6 @@ class ItemListActivity : AppCompatActivity() {
         bottomActions = findViewById(R.id.bottom_actions)
         fabAddItem = findViewById(R.id.fab_add_item)
         doneReorderButton = findViewById(R.id.done_reorder_button)
-        headerDivider = findViewById(R.id.header_divider)
         topBar = findViewById(R.id.top_bar)
         val importCsvButton: Button = findViewById(R.id.import_csv_button)
         val exportCsvButton: Button = findViewById(R.id.export_csv_button)
@@ -209,7 +207,6 @@ class ItemListActivity : AppCompatActivity() {
             emptyView.visibility = View.GONE
             itemsContent.visibility = View.VISIBLE
             fabAddItem.visibility = View.VISIBLE
-            headerDivider.visibility = View.VISIBLE
             topBar.visibility = View.VISIBLE
             topBar.setBackgroundResource(R.color.color_bg_white)
             
@@ -223,7 +220,6 @@ class ItemListActivity : AppCompatActivity() {
             emptyView.visibility = View.VISIBLE
             itemsContent.visibility = View.GONE
             fabAddItem.visibility = View.GONE
-            headerDivider.visibility = View.GONE
             topBar.visibility = View.GONE
             
             // Set navigation bar to match empty state background
diff --git a/app/src/main/java/com/electricdreams/numo/feature/onboarding/AddMintBottomSheet.kt b/app/src/main/java/com/electricdreams/numo/feature/onboarding/AddMintBottomSheet.kt
new file mode 100644
index 00000000..d4201208
--- /dev/null
+++ b/app/src/main/java/com/electricdreams/numo/feature/onboarding/AddMintBottomSheet.kt
@@ -0,0 +1,121 @@
+package com.electricdreams.numo.feature.onboarding
+
+import android.app.Dialog
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.EditText
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
+import com.electricdreams.numo.R
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+
+class AddMintBottomSheet : BottomSheetDialogFragment() {
+
+    interface Listener {
+        fun onAddMintUrl(url: String)
+        fun onScanQrCode()
+    }
+
+    private var listener: Listener? = null
+
+    companion object {
+        fun newInstance(listener: Listener): AddMintBottomSheet {
+            return AddMintBottomSheet().apply {
+                this.listener = listener
+            }
+        }
+    }
+
+    override fun getTheme(): Int = R.style.Theme_Numo_BottomSheet
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.window?.setSoftInputMode(
+            WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
+        )
+        dialog.window?.navigationBarColor = android.graphics.Color.parseColor("#0A2540")
+        return dialog
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.bottom_sheet_add_mint, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val urlInput = view.findViewById<EditText>(R.id.mint_url_input)
+        val addButton = view.findViewById<Button>(R.id.add_mint_button)
+        val scanRow = view.findViewById<View>(R.id.scan_qr_button)
+
+        urlInput.addTextChangedListener(object : TextWatcher {
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+            override fun afterTextChanged(s: Editable?) {
+                val hasText = s?.toString()?.trim()?.isNotEmpty() == true
+                addButton.isEnabled = hasText
+            }
+        })
+
+        addButton.setOnClickListener {
+            val url = urlInput.text.toString().trim()
+            if (url.isNotEmpty()) {
+                listener?.onAddMintUrl(url)
+            }
+        }
+
+        scanRow.setOnClickListener {
+            listener?.onScanQrCode()
+        }
+
+        setupBottomSheetBehavior()
+    }
+
+    fun setLoading(loading: Boolean) {
+        val view = view ?: return
+        val addButton = view.findViewById<Button>(R.id.add_mint_button)
+        val loadingContainer = view.findViewById<LinearLayout>(R.id.add_mint_loading)
+        val urlInput = view.findViewById<EditText>(R.id.mint_url_input)
+
+        if (loading) {
+            addButton.visibility = View.INVISIBLE
+            loadingContainer.visibility = View.VISIBLE
+            urlInput.isEnabled = false
+        } else {
+            addButton.visibility = View.VISIBLE
+            loadingContainer.visibility = View.GONE
+            urlInput.isEnabled = true
+        }
+    }
+
+    private fun setupBottomSheetBehavior() {
+        dialog?.setOnShowListener { dialogInterface ->
+            val bottomSheetDialog = dialogInterface as BottomSheetDialog
+            val bottomSheet = bottomSheetDialog.findViewById<FrameLayout>(
+                com.google.android.material.R.id.design_bottom_sheet
+            )
+            bottomSheet?.let { sheet ->
+                sheet.setBackgroundColor(
+                    android.graphics.Color.parseColor("#0A2540")
+                )
+                val behavior = BottomSheetBehavior.from(sheet)
+                behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                behavior.skipCollapsed = true
+                behavior.isDraggable = true
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/electricdreams/numo/feature/onboarding/AutoCustodyAnimatedView.kt b/app/src/main/java/com/electricdreams/numo/feature/onboarding/AutoCustodyAnimatedView.kt
new file mode 100644
index 00000000..4b003a28
--- /dev/null
+++ b/app/src/main/java/com/electricdreams/numo/feature/onboarding/AutoCustodyAnimatedView.kt
@@ -0,0 +1,291 @@
+package com.electricdreams.numo.feature.onboarding
+
+import android.animation.AnimatorSet
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.*
+import android.util.AttributeSet
+import android.view.View
+import android.view.animation.DecelerateInterpolator
+import android.view.animation.OvershootInterpolator
+
+/**
+ * Animated stacked notification banners for "Automatic self-custody" slide.
+ *
+ * Intro: Front banner slides in, back cards fade in behind.
+ * Cycle: Front banner slides up and fades out, stack shifts forward,
+ *        new card appears at back. Repeats every ~2.5s.
+ *
+ * All positions are derived from two progress floats — no mutable banner list.
+ */
+class AutoCustodyAnimatedView @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : View(context, attrs) {
+
+    private val allSubtitles = listOf(
+        "\$100.00 sent to alice@getalby.com",
+        "\$50.00 sent to satoshi@wallet.com",
+        "\$25.00 sent to bob@strike.me",
+        "\$75.00 sent to carol@coinos.io",
+        "\$30.00 sent to dave@phoenix.acinq.co"
+    )
+
+    // Settled positions for 3-card stack
+    private val settledY     = floatArrayOf(0f,  10f,  18f)
+    private val settledScale = floatArrayOf(1f,  0.95f, 0.90f)
+    private val settledAlpha = floatArrayOf(1f,  0.45f, 0.18f)
+
+    // Animation state — these floats drive ALL rendering
+    private var introProgress = 0f
+    private var backIntroProgress = 0f
+    private var cycleProgress = 0f
+    private var currentIndex = 0
+    private var animStarted = false
+    private var introComplete = false
+
+    private var introAnimator: AnimatorSet? = null
+    private var cycleAnimator: ValueAnimator? = null
+    private var cycleRunnable: Runnable? = null
+
+    // Paints
+    private val cardPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.WHITE; style = Paint.Style.FILL
+    }
+    private val shadowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.parseColor("#20000000")
+        maskFilter = BlurMaskFilter(14f, BlurMaskFilter.Blur.NORMAL)
+    }
+    private val orangeBgPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.parseColor("#FFF0DB"); style = Paint.Style.FILL
+    }
+    private val lightningPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.parseColor("#F7931A"); style = Paint.Style.FILL
+    }
+    private val titlePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.parseColor("#0A2540")
+        typeface = Typeface.create("sans-serif-medium", Typeface.BOLD)
+    }
+    private val subtitlePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.parseColor("#6F6F73")
+        typeface = Typeface.create("sans-serif", Typeface.NORMAL)
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        val w = width.toFloat()
+        val h = height.toFloat()
+        if (w == 0f || h == 0f) return
+        val cx = w / 2f
+        val s = w / 380f
+        val bannerW = 340f * s
+        val bannerH = 78f * s
+        val bannerR = 14f * s
+        val centerY = h * 0.4f
+
+        if (!introComplete) {
+            // Intro: back cards first, then front on top
+            val bp = backIntroProgress
+            if (bp > 0.01f) {
+                drawBanner(canvas, cx, centerY + settledY[2] * s, bannerW, bannerH, bannerR, s,
+                    subtitle(2), settledAlpha[2] * bp, settledScale[2])
+                drawBanner(canvas, cx, centerY + settledY[1] * s, bannerW, bannerH, bannerR, s,
+                    subtitle(1), settledAlpha[1] * bp, settledScale[1])
+            }
+            val p = introProgress
+            drawBanner(canvas, cx, centerY + (settledY[0] + 50f * (1f - p)) * s,
+                bannerW, bannerH, bannerR, s, subtitle(0), p, 0.95f + 0.05f * p)
+
+        } else if (cycleProgress > 0f) {
+            // Cycle transition: 4 cards derived from cycleProgress, back to front
+            val p = cycleProgress
+            drawBanner(canvas, cx, centerY + lerp(28f, settledY[2], p) * s,
+                bannerW, bannerH, bannerR, s, subtitle(3),
+                lerp(0f, settledAlpha[2], p), lerp(0.85f, settledScale[2], p))
+            drawBanner(canvas, cx, centerY + lerp(settledY[2], settledY[1], p) * s,
+                bannerW, bannerH, bannerR, s, subtitle(2),
+                lerp(settledAlpha[2], settledAlpha[1], p), lerp(settledScale[2], settledScale[1], p))
+            drawBanner(canvas, cx, centerY + lerp(settledY[1], settledY[0], p) * s,
+                bannerW, bannerH, bannerR, s, subtitle(1),
+                lerp(settledAlpha[1], settledAlpha[0], p), lerp(settledScale[1], settledScale[0], p))
+            drawBanner(canvas, cx, centerY + lerp(settledY[0], -40f, p) * s,
+                bannerW, bannerH, bannerR, s, subtitle(0),
+                lerp(settledAlpha[0], 0f, p), lerp(settledScale[0], 0.95f, p))
+
+        } else {
+            // Settled: 3 banners at rest, back to front
+            for (i in 2 downTo 0) {
+                drawBanner(canvas, cx, centerY + settledY[i] * s, bannerW, bannerH, bannerR, s,
+                    subtitle(i), settledAlpha[i], settledScale[i])
+            }
+        }
+    }
+
+    private fun subtitle(offset: Int): String =
+        allSubtitles[(currentIndex + offset) % allSubtitles.size]
+
+    private fun drawBanner(
+        canvas: Canvas, cx: Float, drawY: Float, w: Float, h: Float,
+        r: Float, s: Float, subtitle: String, alpha: Float, scale: Float
+    ) {
+        if (alpha < 0.01f) return
+        canvas.save()
+        canvas.translate(cx, drawY + h / 2f)
+        canvas.scale(scale, scale)
+        canvas.translate(-cx, -(drawY + h / 2f))
+
+        val rect = RectF(cx - w / 2, drawY, cx + w / 2, drawY + h)
+
+        shadowPaint.alpha = (alpha * 50).toInt()
+        canvas.drawRoundRect(
+            RectF(rect.left + 2 * s, rect.top + 5 * s, rect.right + 2 * s, rect.bottom + 5 * s),
+            r, r, shadowPaint
+        )
+        cardPaint.alpha = (alpha * 255).toInt()
+        canvas.drawRoundRect(rect, r, r, cardPaint)
+
+        val iconSize = 46f * s
+        val iconR = 12f * s
+        val iconX = rect.left + 16f * s
+        val iconCy = drawY + h / 2f
+        val iconY = iconCy - iconSize / 2f
+
+        orangeBgPaint.alpha = (alpha * 255).toInt()
+        canvas.drawRoundRect(
+            RectF(iconX, iconY, iconX + iconSize, iconY + iconSize),
+            iconR, iconR, orangeBgPaint
+        )
+        lightningPaint.alpha = (alpha * 255).toInt()
+        val bCx = iconX + iconSize / 2f
+        val bolt = Path().apply {
+            moveTo(bCx + 1.5f * s, iconCy - 11f * s)
+            lineTo(bCx - 6f * s, iconCy + 1f * s)
+            lineTo(bCx - 0.5f * s, iconCy + 1f * s)
+            lineTo(bCx - 1.5f * s, iconCy + 11f * s)
+            lineTo(bCx + 6f * s, iconCy - 1f * s)
+            lineTo(bCx + 0.5f * s, iconCy - 1f * s)
+            close()
+        }
+        canvas.drawPath(bolt, lightningPaint)
+
+        val textX = iconX + iconSize + 14f * s
+        titlePaint.textSize = 15f * s
+        titlePaint.alpha = (alpha * 255).toInt()
+        canvas.drawText("Threshold Reached", textX, iconCy - 4f * s, titlePaint)
+
+        subtitlePaint.textSize = 12f * s
+        subtitlePaint.alpha = (alpha * 200).toInt()
+        canvas.drawText(subtitle, textX, iconCy + 16f * s, subtitlePaint)
+
+        canvas.restore()
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        if (width > 0 && height > 0 && !animStarted) {
+            startIntro()
+        }
+    }
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        if (w > 0 && h > 0 && !animStarted) {
+            startIntro()
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        stopAll()
+    }
+
+    private fun stopAll() {
+        // Remove listeners BEFORE cancel to prevent onAnimationEnd cascades
+        introAnimator?.removeAllListeners()
+        introAnimator?.cancel()
+        introAnimator = null
+
+        cycleAnimator?.removeAllListeners()
+        cycleAnimator?.cancel()
+        cycleAnimator = null
+
+        cycleRunnable?.let { removeCallbacks(it) }
+        cycleRunnable = null
+
+        // Reset so animation replays fresh on re-attach
+        animStarted = false
+        introComplete = false
+        introProgress = 0f
+        backIntroProgress = 0f
+        cycleProgress = 0f
+        currentIndex = 0
+    }
+
+    private fun startIntro() {
+        if (animStarted) return
+        animStarted = true
+
+        val frontIn = ValueAnimator.ofFloat(0f, 1f).apply {
+            duration = 600
+            startDelay = 300
+            interpolator = OvershootInterpolator(0.8f)
+            addUpdateListener {
+                introProgress = it.animatedValue as Float
+                invalidate()
+            }
+        }
+
+        val backIn = ValueAnimator.ofFloat(0f, 1f).apply {
+            duration = 500
+            startDelay = 1000
+            interpolator = DecelerateInterpolator(1.5f)
+            addUpdateListener {
+                backIntroProgress = it.animatedValue as Float
+                invalidate()
+            }
+        }
+
+        introAnimator = AnimatorSet().apply {
+            playTogether(frontIn, backIn)
+            addListener(object : android.animation.AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: android.animation.Animator) {
+                    introComplete = true
+                    invalidate()
+                    scheduleCycle()
+                }
+            })
+            start()
+        }
+    }
+
+    private fun scheduleCycle() {
+        if (!isAttachedToWindow) return
+        cycleRunnable = Runnable { doCycle() }
+        postDelayed(cycleRunnable!!, 2500)
+    }
+
+    private fun doCycle() {
+        if (!isAttachedToWindow) return
+
+        cycleAnimator = ValueAnimator.ofFloat(0f, 1f).apply {
+            duration = 500
+            interpolator = DecelerateInterpolator(1.8f)
+            addUpdateListener {
+                cycleProgress = it.animatedValue as Float
+                invalidate()
+            }
+            addListener(object : android.animation.AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: android.animation.Animator) {
+                    if (isAttachedToWindow) {
+                        currentIndex = (currentIndex + 1) % allSubtitles.size
+                        cycleProgress = 0f
+                        invalidate()
+                        scheduleCycle()
+                    }
+                }
+            })
+            start()
+        }
+    }
+
+    private fun lerp(a: Float, b: Float, t: Float) = a + (b - a) * t
+}
diff --git a/app/src/main/java/com/electricdreams/numo/feature/onboarding/ExplainerSlideAdapter.kt b/app/src/main/java/com/electricdreams/numo/feature/onboarding/ExplainerSlideAdapter.kt
new file mode 100644
index 00000000..ca5343be
--- /dev/null
+++ b/app/src/main/java/com/electricdreams/numo/feature/onboarding/ExplainerSlideAdapter.kt
@@ -0,0 +1,97 @@
+package com.electricdreams.numo.feature.onboarding
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.electricdreams.numo.R
+
+class ExplainerSlideAdapter : RecyclerView.Adapter<ExplainerSlideAdapter.SlideViewHolder>() {
+
+    private companion object {
+        const val SLIDE_PHONES = 0
+        const val SLIDE_CUSTODY = 1
+        const val SLIDE_ZERO_FEES = 2
+    }
+
+    private data class Slide(val titleRes: Int, val bodyRes: Int, val type: Int)
+
+    private val slides = listOf(
+        Slide(R.string.explainer_slide1_title, R.string.explainer_slide1_body, SLIDE_PHONES),
+        Slide(R.string.explainer_slide2_title, R.string.explainer_slide2_body, SLIDE_CUSTODY),
+        Slide(R.string.explainer_slide3_title, R.string.explainer_slide3_body, SLIDE_ZERO_FEES)
+    )
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SlideViewHolder {
+        val view = LayoutInflater.from(parent.context)
+            .inflate(R.layout.item_explainer_slide, parent, false)
+        return SlideViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: SlideViewHolder, position: Int) {
+        val slide = slides[position]
+        holder.title.setText(slide.titleRes)
+        holder.body.setText(slide.bodyRes)
+
+        val container = holder.illustrationContainer
+
+        // Reset: hide all static views, remove any custom views
+        holder.illustration.visibility = View.GONE
+        holder.phoneLeft.visibility = View.GONE
+        holder.phoneRight.visibility = View.GONE
+        // Remove any previously added custom views
+        val toRemove = mutableListOf<View>()
+        for (i in 0 until container.childCount) {
+            val child = container.getChildAt(i)
+            if (child is AutoCustodyAnimatedView || child is ZeroFeesIllustration) {
+                toRemove.add(child)
+            }
+        }
+        toRemove.forEach { container.removeView(it) }
+
+        when (slide.type) {
+            SLIDE_PHONES -> {
+                holder.phoneLeft.visibility = View.VISIBLE
+                holder.phoneRight.visibility = View.VISIBLE
+                holder.phoneLeft.setImageResource(R.drawable.img_minibits_nfc)
+                holder.phoneRight.setImageResource(R.drawable.img_numo_invoice)
+            }
+
+            SLIDE_CUSTODY -> {
+                val custodyView = AutoCustodyAnimatedView(holder.itemView.context)
+                custodyView.layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT
+                )
+                container.addView(custodyView)
+            }
+
+            SLIDE_ZERO_FEES -> {
+                val dp32 = (32 * holder.itemView.resources.displayMetrics.density).toInt()
+                val zeroFees = ZeroFeesIllustration(holder.itemView.context)
+                zeroFees.layoutParams = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.MATCH_PARENT,
+                    FrameLayout.LayoutParams.MATCH_PARENT
+                ).apply {
+                    marginStart = dp32
+                    marginEnd = dp32
+                }
+                container.addView(zeroFees)
+            }
+        }
+    }
+
+    override fun getItemCount() = slides.size
+
+    class SlideViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val title: TextView = view.findViewById(R.id.slide_title)
+        val body: TextView = view.findViewById(R.id.slide_body)
+        val illustrationContainer: FrameLayout = view.findViewById(R.id.slide_illustration_container)
+        val illustration: ImageView = view.findViewById(R.id.slide_illustration)
+        val phoneLeft: ImageView = view.findViewById(R.id.slide_phone_left)
+        val phoneRight: ImageView = view.findViewById(R.id.slide_phone_right)
+    }
+}
diff --git a/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingActivity.kt
index d097da87..0522b526 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingActivity.kt
@@ -16,12 +16,17 @@ import android.text.TextPaint
 import android.text.TextWatcher
 import android.text.method.LinkMovementMethod
 import android.text.style.ClickableSpan
+import android.view.MotionEvent
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.view.animation.DecelerateInterpolator
+import android.view.animation.OvershootInterpolator
+import androidx.viewpager2.widget.ViewPager2
 import android.view.inputmethod.EditorInfo
+import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.FrameLayout
+import android.widget.Button
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ProgressBar
@@ -38,6 +43,8 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.gridlayout.widget.GridLayout
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.electricdreams.numo.ModernPOSActivity
 import com.electricdreams.numo.R
 import com.electricdreams.numo.core.cashu.CashuWalletManager
@@ -47,7 +54,6 @@ import com.electricdreams.numo.core.util.MintManager
 import com.electricdreams.numo.core.util.MintProfileService
 import com.electricdreams.numo.feature.scanner.QRScannerActivity
 import com.electricdreams.numo.nostr.NostrMintBackup
-import com.electricdreams.numo.ui.components.AddMintInputCard
 import com.electricdreams.numo.ui.seed.SeedWordEditText
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.imageview.ShapeableImageView
@@ -130,7 +136,6 @@ class OnboardingActivity : AppCompatActivity() {
     // Step 1: Welcome
     private lateinit var welcomeContainer: FrameLayout
     private lateinit var welcomeBackgroundOverlay: View
-    private lateinit var welcomeNavyCurve: ImageView
     private lateinit var welcomeWordmark: ImageView
     private lateinit var welcomeTagline: TextView
     private lateinit var termsText: TextView
@@ -142,6 +147,21 @@ class OnboardingActivity : AppCompatActivity() {
     private lateinit var createWalletButton: View
     private lateinit var restoreWalletButton: View
 
+    // Teaser + Explainer
+    private lateinit var teaserCard: View
+    private lateinit var explainerOverlay: View
+    private lateinit var explainerSheet: View
+    private lateinit var explainerBackdrop: View
+    private lateinit var explainerViewPager: ViewPager2
+    private lateinit var explainerCloseBtn: View
+    private lateinit var explainerCloseContainer: View
+    private lateinit var chevronHint1: ImageView
+    private lateinit var chevronHint2: ImageView
+    private lateinit var chevronHint3: ImageView
+    private lateinit var chevronHintContainer: View
+    private var explainerOpen = false
+    private var chevronAnimatorSet: AnimatorSet? = null
+
     // Step 3: Enter Seed (Restore)
     private lateinit var enterSeedContainer: FrameLayout
     private lateinit var seedInputGrid: GridLayout
@@ -166,10 +186,8 @@ class OnboardingActivity : AppCompatActivity() {
     private lateinit var backupStatusIcon: ImageView
     private lateinit var backupStatusTitle: TextView
     private lateinit var backupStatusSubtitle: TextView
-    private lateinit var mintsListContainer: LinearLayout
-    private lateinit var mintsCountText: TextView
-    private lateinit var mintsSubtitle: TextView
-    private lateinit var addDifferentMintCard: AddMintInputCard
+    private lateinit var mintsRecyclerView: RecyclerView
+    private lateinit var mintAdapter: OnboardingMintAdapter
     private lateinit var mintsContinueButton: MaterialButton
     private lateinit var mintsBackButton: ImageView
 
@@ -190,12 +208,19 @@ class OnboardingActivity : AppCompatActivity() {
     private val seedInputs = mutableListOf<SeedWordEditText>()
     private val mintProgressViews = mutableMapOf<String, View>()
 
+    private var addMintBottomSheet: AddMintBottomSheet? = null
+
     private val onboardingQrScannerLauncher = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
     ) { result ->
         if (result.resultCode == RESULT_OK) {
             val qrValue = result.data?.getStringExtra(QRScannerActivity.EXTRA_QR_VALUE)
-            qrValue?.let { addDifferentMintCard.setMintUrl(mintProfileService.normalizeUrl(it)) }
+            qrValue?.let { scannedUrl ->
+                // Dismiss the bottom sheet if open and add the scanned mint
+                addMintBottomSheet?.dismiss()
+                addMintBottomSheet = null
+                addDifferentMint(mintProfileService.normalizeUrl(scannedUrl))
+            }
         }
     }
 
@@ -256,15 +281,19 @@ class OnboardingActivity : AppCompatActivity() {
             // Dark icons on white background
             windowInsetsController.isAppearanceLightStatusBars = true
             windowInsetsController.isAppearanceLightNavigationBars = true
+        } else if (step == OnboardingStep.CHOOSE_PATH) {
+            // Navy bars — nav bar matches dark teaser area at bottom
+            window.statusBarColor = android.graphics.Color.parseColor("#0A2540")
+            window.navigationBarColor = android.graphics.Color.parseColor("#0A2540")
+            windowInsetsController.isAppearanceLightStatusBars = false
+            windowInsetsController.isAppearanceLightNavigationBars = false
         } else {
-            // White/light bars for all other screens
-            val bgColor = android.graphics.Color.parseColor("#F6F7F8")
-            window.statusBarColor = bgColor
-            window.navigationBarColor = bgColor
-            
-            // Dark icons on light background
-            windowInsetsController.isAppearanceLightStatusBars = true
-            windowInsetsController.isAppearanceLightNavigationBars = true
+            // Navy bars for all other onboarding screens
+            val navyLight = android.graphics.Color.parseColor("#0A2540")
+            window.statusBarColor = navyLight
+            window.navigationBarColor = navyLight
+            windowInsetsController.isAppearanceLightStatusBars = false
+            windowInsetsController.isAppearanceLightNavigationBars = false
         }
     }
 
@@ -272,7 +301,6 @@ class OnboardingActivity : AppCompatActivity() {
         // Welcome
         welcomeContainer = findViewById(R.id.welcome_container)
         welcomeBackgroundOverlay = findViewById(R.id.welcome_background_overlay)
-        welcomeNavyCurve = findViewById(R.id.welcome_navy_curve)
         welcomeWordmark = findViewById(R.id.welcome_wordmark)
         welcomeTagline = findViewById(R.id.welcome_tagline)
         termsText = findViewById(R.id.terms_text)
@@ -284,6 +312,21 @@ class OnboardingActivity : AppCompatActivity() {
         createWalletButton = findViewById(R.id.create_wallet_button)
         restoreWalletButton = findViewById(R.id.restore_wallet_button)
 
+        // Teaser + Explainer
+        teaserCard = findViewById(R.id.teaser_card)
+        explainerOverlay = findViewById(R.id.explainer_overlay)
+        explainerSheet = findViewById(R.id.explainer_sheet)
+        explainerBackdrop = findViewById(R.id.explainer_backdrop)
+        explainerViewPager = findViewById(R.id.explainer_view_pager)
+        explainerCloseBtn = findViewById(R.id.explainer_close_btn)
+        explainerCloseContainer = findViewById(R.id.explainer_close_container)
+        chevronHint1 = findViewById(R.id.chevron_hint_1)
+        chevronHint2 = findViewById(R.id.chevron_hint_2)
+        chevronHint3 = findViewById(R.id.chevron_hint_3)
+        chevronHintContainer = findViewById(R.id.chevron_hint_container)
+
+        setupExplainerViewPager()
+
         // Enter Seed
         enterSeedContainer = findViewById(R.id.enter_seed_container)
         seedInputGrid = findViewById(R.id.seed_input_grid)
@@ -308,15 +351,37 @@ class OnboardingActivity : AppCompatActivity() {
         backupStatusIcon = findViewById(R.id.backup_status_icon)
         backupStatusTitle = findViewById(R.id.backup_status_title)
         backupStatusSubtitle = findViewById(R.id.backup_status_subtitle)
-        mintsListContainer = findViewById(R.id.mints_list_container)
-        mintsCountText = findViewById(R.id.mints_count_text)
-        mintsSubtitle = findViewById(R.id.mints_subtitle)
-        addDifferentMintCard = findViewById(R.id.add_different_mint_card)
-        addDifferentMintCard.setHeaderTitle(getString(R.string.onboarding_mints_add_different))
-        addDifferentMintCard.setOnboardingModeEnabled(true)
+        mintsRecyclerView = findViewById(R.id.mints_recycler_view)
         mintsContinueButton = findViewById(R.id.mints_continue_button)
         mintsBackButton = findViewById(R.id.mints_back_button)
 
+        // Setup RecyclerView + Adapter
+        mintAdapter = OnboardingMintAdapter(object : OnboardingMintAdapter.Listener {
+            override fun onLoadMintIcon(mintUrl: String, iconView: ShapeableImageView) {
+                loadMintIcon(mintUrl, iconView)
+            }
+            override fun onResolveMintName(mintUrl: String): String {
+                return resolveOnboardingMintDisplayName(mintUrl)
+            }
+            override fun onMintAcceptedChanged() {
+                updateContinueButtonState()
+            }
+            override fun onDefaultMintChanged(newDefaultUrl: String) {
+                updateContinueButtonState()
+            }
+            override fun onAddMintClicked() {
+                showAddMintBottomSheet()
+            }
+            override fun onRequestSetDefault(mintUrl: String, mintName: String) {
+                showSetDefaultConfirmationDialog(mintUrl, mintName)
+            }
+        })
+        mintAdapter.setHeaderStrings(
+            acceptFromTitle = getString(R.string.onboarding_mints_accept_from_header)
+        )
+        mintsRecyclerView.layoutManager = LinearLayoutManager(this)
+        mintsRecyclerView.adapter = mintAdapter
+
         // Restoring
         restoringContainer = findViewById(R.id.restoring_container)
         restoringStatus = findViewById(R.id.restoring_status)
@@ -396,13 +461,13 @@ class OnboardingActivity : AppCompatActivity() {
         val container = LinearLayout(this).apply {
             orientation = LinearLayout.HORIZONTAL
             gravity = android.view.Gravity.CENTER_VERTICAL
-            background = ContextCompat.getDrawable(context, R.drawable.bg_seed_input)
+            background = ContextCompat.getDrawable(context, R.drawable.bg_seed_input_dark)
             setPadding(12.dpToPx(), 10.dpToPx(), 12.dpToPx(), 10.dpToPx())
         }
 
         val indexText = TextView(this).apply {
             text = "$index"
-            setTextColor(ContextCompat.getColor(context, R.color.color_text_tertiary))
+            setTextColor(android.graphics.Color.parseColor("#73FFFFFF"))
             textSize = 13f
             typeface = android.graphics.Typeface.create("sans-serif-medium", android.graphics.Typeface.NORMAL)
             layoutParams = LinearLayout.LayoutParams(24.dpToPx(), LinearLayout.LayoutParams.WRAP_CONTENT)
@@ -411,8 +476,8 @@ class OnboardingActivity : AppCompatActivity() {
 
         val input = SeedWordEditText(this).apply {
             hint = ""
-            setTextColor(ContextCompat.getColor(context, R.color.color_text_primary))
-            setHintTextColor(ContextCompat.getColor(context, R.color.color_text_tertiary))
+            setTextColor(android.graphics.Color.WHITE)
+            setHintTextColor(android.graphics.Color.parseColor("#4DFFFFFF"))
             textSize = 15f
             typeface = android.graphics.Typeface.MONOSPACE
             background = null
@@ -436,7 +501,7 @@ class OnboardingActivity : AppCompatActivity() {
             setOnFocusChangeListener { _, hasFocus ->
                 container.background = ContextCompat.getDrawable(
                     context,
-                    if (hasFocus) R.drawable.bg_seed_input_focused else R.drawable.bg_seed_input
+                    if (hasFocus) R.drawable.bg_seed_input_dark_focused else R.drawable.bg_seed_input_dark
                 )
             }
 
@@ -473,6 +538,10 @@ class OnboardingActivity : AppCompatActivity() {
             showStep(OnboardingStep.ENTER_SEED)
         }
 
+        // Teaser + Explainer
+        setupTeaserTouchListener()
+        explainerCloseBtn.setOnClickListener { closeExplainer() }
+
         // Enter Seed
         seedBackButton.setOnClickListener {
             showStep(OnboardingStep.CHOOSE_PATH)
@@ -503,29 +572,33 @@ class OnboardingActivity : AppCompatActivity() {
             }
         }
 
-        addDifferentMintCard.setOnAddMintListener(object : AddMintInputCard.OnAddMintListener {
-            override fun onAddMint(mintUrl: String) {
-                addDifferentMint(mintUrl)
-            }
-
-            override fun onScanQR() {
-                openOnboardingMintQrScanner()
-            }
-        })
-
         // Success
         enterWalletButton.setOnClickListener {
             completeOnboarding()
         }
     }
 
+    private fun hideKeyboard() {
+        val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
+        currentFocus?.let { imm.hideSoftInputFromWindow(it.windowToken, 0) }
+    }
+
     private fun showStep(step: OnboardingStep) {
+        // Always dismiss keyboard when changing steps
+        hideKeyboard()
+
         // Stop welcome animation if leaving welcome screen
         if (currentStep == OnboardingStep.WELCOME && step != OnboardingStep.WELCOME) {
             welcomeAnimator?.stop()
             welcomeAnimator = null
         }
 
+        // Close explainer and stop chevron animation if leaving CHOOSE_PATH
+        if (currentStep == OnboardingStep.CHOOSE_PATH && step != OnboardingStep.CHOOSE_PATH) {
+            resetExplainer()
+            stopChevronPulseAnimation()
+        }
+
         currentStep = step
 
         // Update window bars based on the step (green only for welcome screen)
@@ -559,7 +632,12 @@ class OnboardingActivity : AppCompatActivity() {
         if (step == OnboardingStep.WELCOME) {
             animateWelcomeScreen()
         } else {
-        animateContainerIn(containerToShow)
+            animateContainerIn(containerToShow)
+        }
+
+        // Start chevron animation when showing CHOOSE_PATH
+        if (step == OnboardingStep.CHOOSE_PATH) {
+            startChevronPulseAnimation()
         }
     }
 
@@ -578,6 +656,233 @@ class OnboardingActivity : AppCompatActivity() {
         }.start()
     }
 
+    // ══════════════════════════════════════════
+    // Explainer overlay
+    // ══════════════════════════════════════════
+
+    private fun setupExplainerViewPager() {
+        explainerViewPager.orientation = ViewPager2.ORIENTATION_VERTICAL
+        explainerViewPager.adapter = ExplainerSlideAdapter()
+        explainerViewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                // Show chevrons on slides 0 and 1, hide on last slide
+                chevronHintContainer.animate()
+                    .alpha(if (position <= 1) 1f else 0f)
+                    .setDuration(200)
+                    .start()
+            }
+        })
+
+        // Tap chevrons to advance to next slide
+        chevronHintContainer.setOnClickListener {
+            val next = explainerViewPager.currentItem + 1
+            if (next < (explainerViewPager.adapter?.itemCount ?: 0)) {
+                explainerViewPager.setCurrentItem(next, true)
+            }
+        }
+
+        // Make explainer overlay extend behind system bars
+        val dp16 = (16 * resources.displayMetrics.density).toInt()
+        ViewCompat.setOnApplyWindowInsetsListener(explainerOverlay) { v, windowInsets ->
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+            (v.layoutParams as FrameLayout.LayoutParams).apply {
+                topMargin = -insets.top
+                bottomMargin = -insets.bottom
+            }
+            v.layoutParams = v.layoutParams
+            explainerCloseContainer.setPadding(
+                explainerCloseContainer.paddingStart, insets.top + dp16, 0, 0
+            )
+            chevronHintContainer.setPadding(0, dp16, 0, insets.bottom + dp16)
+            windowInsets
+        }
+    }
+
+    @android.annotation.SuppressLint("ClickableViewAccessibility")
+    private fun setupTeaserTouchListener() {
+        var startY = 0f
+        var isDragging = false
+
+        teaserCard.setOnTouchListener { _, event ->
+            when (event.actionMasked) {
+                MotionEvent.ACTION_DOWN -> {
+                    startY = event.rawY
+                    isDragging = false
+                    true
+                }
+                MotionEvent.ACTION_MOVE -> {
+                    val diff = startY - event.rawY
+                    if (diff > 10) {
+                        isDragging = true
+                        // Show the overlay and track finger
+                        explainerOverlay.visibility = View.VISIBLE
+                        val screenHeight = explainerOverlay.height.toFloat()
+                        val progress = (diff / screenHeight).coerceIn(0f, 1f)
+                        explainerSheet.translationY = screenHeight * (1f - progress)
+                        explainerBackdrop.alpha = progress
+                        // Fade out teaser proportionally
+                        teaserCard.alpha = 1f - progress
+                    }
+                    true
+                }
+                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                    val diff = startY - event.rawY
+                    if (isDragging) {
+                        val threshold = 80 * resources.displayMetrics.density
+                        if (diff > threshold) {
+                            openExplainer()
+                        } else {
+                            snapExplainerClosed()
+                        }
+                    } else if (diff < 10 * resources.displayMetrics.density) {
+                        // Tap — open
+                        openExplainer()
+                    }
+                    true
+                }
+                else -> false
+            }
+        }
+    }
+
+    private fun setExplainerWindowBars(open: Boolean) {
+        val controller = WindowInsetsControllerCompat(window, window.decorView)
+        val darkNavy = android.graphics.Color.parseColor("#0A2540")
+        if (open) {
+            window.statusBarColor = darkNavy
+        } else {
+            window.statusBarColor = android.graphics.Color.parseColor("#0A2540")
+        }
+        window.navigationBarColor = darkNavy // always dark navy at bottom
+        controller.isAppearanceLightStatusBars = false
+        controller.isAppearanceLightNavigationBars = false
+    }
+
+    private fun openExplainer() {
+        explainerOpen = true
+        explainerOverlay.visibility = View.VISIBLE
+        setExplainerWindowBars(true)
+
+        // Reset adapter so animations replay fresh
+        explainerViewPager.adapter = ExplainerSlideAdapter()
+        explainerViewPager.setCurrentItem(0, false)
+        val screenHeight = explainerOverlay.height.toFloat()
+
+        // Animate sheet up
+        ObjectAnimator.ofFloat(explainerSheet, "translationY", explainerSheet.translationY, 0f).apply {
+            duration = 450
+            interpolator = android.view.animation.PathInterpolator(0.32f, 0.72f, 0f, 1f)
+        }.start()
+
+        // Fade in backdrop
+        ObjectAnimator.ofFloat(explainerBackdrop, "alpha", explainerBackdrop.alpha, 1f).apply {
+            duration = 350
+        }.start()
+
+        // Slide teaser down and fade out
+        ObjectAnimator.ofFloat(teaserCard, "translationY", 0f, screenHeight * 0.3f).apply {
+            duration = 350
+        }.start()
+        ObjectAnimator.ofFloat(teaserCard, "alpha", 1f, 0f).apply {
+            duration = 200
+        }.start()
+    }
+
+    private fun closeExplainer() {
+        explainerOpen = false
+        setExplainerWindowBars(false)
+        val screenHeight = explainerOverlay.height.toFloat()
+
+        // Animate sheet down
+        ObjectAnimator.ofFloat(explainerSheet, "translationY", 0f, screenHeight).apply {
+            duration = 450
+            interpolator = android.view.animation.PathInterpolator(0.32f, 0.72f, 0f, 1f)
+            addListener(object : android.animation.AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: android.animation.Animator) {
+                    explainerOverlay.visibility = View.GONE
+                    explainerViewPager.setCurrentItem(0, false)
+                }
+            })
+        }.start()
+
+        // Fade backdrop out
+        ObjectAnimator.ofFloat(explainerBackdrop, "alpha", 1f, 0f).apply {
+            duration = 350
+        }.start()
+
+        // Bounce teaser back in after a short delay
+        teaserCard.postDelayed({
+            teaserCard.translationY = 200f
+            ObjectAnimator.ofFloat(teaserCard, "translationY", 200f, 0f).apply {
+                duration = 500
+                interpolator = OvershootInterpolator(1.2f)
+            }.start()
+            ObjectAnimator.ofFloat(teaserCard, "alpha", 0f, 1f).apply {
+                duration = 300
+            }.start()
+        }, 300)
+    }
+
+    private fun snapExplainerClosed() {
+        setExplainerWindowBars(false)
+        val screenHeight = explainerOverlay.height.toFloat()
+
+        ObjectAnimator.ofFloat(explainerSheet, "translationY", explainerSheet.translationY, screenHeight).apply {
+            duration = 350
+            interpolator = DecelerateInterpolator()
+            addListener(object : android.animation.AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: android.animation.Animator) {
+                    explainerOverlay.visibility = View.GONE
+                }
+            })
+        }.start()
+
+        ObjectAnimator.ofFloat(explainerBackdrop, "alpha", explainerBackdrop.alpha, 0f).apply {
+            duration = 300
+        }.start()
+
+        // Restore teaser
+        ObjectAnimator.ofFloat(teaserCard, "alpha", teaserCard.alpha, 1f).apply {
+            duration = 200
+        }.start()
+    }
+
+    private fun resetExplainer() {
+        if (explainerOpen) {
+            explainerOpen = false
+            explainerOverlay.visibility = View.GONE
+            explainerSheet.translationY = 2000f
+            explainerBackdrop.alpha = 0f
+            teaserCard.translationY = 0f
+            teaserCard.alpha = 1f
+            explainerViewPager.setCurrentItem(0, false)
+        }
+    }
+
+    private fun startChevronPulseAnimation() {
+        stopChevronPulseAnimation()
+
+        val chevrons = listOf(chevronHint1, chevronHint2, chevronHint3)
+        val animators = chevrons.mapIndexed { index, chevron ->
+            ObjectAnimator.ofFloat(chevron, "alpha", 0.12f, 0.7f, 0.12f).apply {
+                duration = 1800
+                repeatCount = ValueAnimator.INFINITE
+                interpolator = AccelerateDecelerateInterpolator()
+                startDelay = (index * 200).toLong()
+            }
+        }
+
+        chevronAnimatorSet = AnimatorSet().apply {
+            playTogether(animators.map { it as android.animation.Animator })
+            start()
+        }
+    }
+
+    private fun stopChevronPulseAnimation() {
+        chevronAnimatorSet?.cancel()
+        chevronAnimatorSet = null
+    }
+
     /**
      * Cinematic welcome screen animation with 5 phases:
      * 1. Logo splash with shimmer
@@ -592,6 +897,7 @@ class OnboardingActivity : AppCompatActivity() {
             activity = this,
             container = welcomeContainer,
             wordmark = welcomeWordmark,
+            wordmarkGreen = findViewById(R.id.welcome_wordmark_green),
             tagline = welcomeTagline,
             acceptButton = acceptButton,
             termsText = termsText,
@@ -642,8 +948,9 @@ class OnboardingActivity : AppCompatActivity() {
                 discoveredMints.clear()
                 selectedMints.clear()
                 onboardingMintDisplayNames.clear()
-                discoveredMints.addAll(ONBOARDING_DEFAULT_MINTS)
-                selectedMints.addAll(ONBOARDING_DEFAULT_MINTS)
+                val healthyMints = filterHealthyMints(ONBOARDING_DEFAULT_MINTS.shuffled())
+                discoveredMints.addAll(healthyMints)
+                selectedMints.addAll(healthyMints)
                 backupFound = false
 
                 withContext(Dispatchers.Main) {
@@ -745,9 +1052,9 @@ class OnboardingActivity : AppCompatActivity() {
             else -> {
                 seedValidationStatus.visibility = View.VISIBLE
                 seedValidationIcon.setImageResource(R.drawable.ic_check)
-                seedValidationIcon.setColorFilter(ContextCompat.getColor(this, R.color.color_success_green))
+                seedValidationIcon.setColorFilter(ContextCompat.getColor(this, R.color.numo_fluorescent_green))
                 seedValidationText.text = getString(R.string.onboarding_seed_validation_ready)
-                seedValidationText.setTextColor(ContextCompat.getColor(this, R.color.color_success_green))
+                seedValidationText.setTextColor(ContextCompat.getColor(this, R.color.numo_fluorescent_green))
             }
         }
 
@@ -836,13 +1143,15 @@ class OnboardingActivity : AppCompatActivity() {
                 val normalizedBackupMints = result.mints
                     .map { mintProfileService.normalizeUrl(it) }
                     .filter { it.isNotBlank() }
+                    .shuffled()
                 discoveredMints.addAll(normalizedBackupMints)
                 selectedMints.addAll(normalizedBackupMints)
             } else {
                 backupFound = false
                 backupTimestamp = null
-                discoveredMints.addAll(ONBOARDING_DEFAULT_MINTS)
-                selectedMints.addAll(ONBOARDING_DEFAULT_MINTS)
+                val healthyMints = filterHealthyMints(ONBOARDING_DEFAULT_MINTS.shuffled())
+                discoveredMints.addAll(healthyMints)
+                selectedMints.addAll(healthyMints)
             }
 
             withContext(Dispatchers.Main) {
@@ -920,102 +1229,69 @@ class OnboardingActivity : AppCompatActivity() {
             if (backupFound) {
                 backupStatusCard.background = ContextCompat.getDrawable(this, R.drawable.bg_success_card)
                 backupStatusIcon.setImageResource(R.drawable.ic_cloud_done)
-                backupStatusIcon.setColorFilter(ContextCompat.getColor(this, R.color.color_success_green))
+                backupStatusIcon.setColorFilter(ContextCompat.getColor(this, R.color.numo_fluorescent_green))
                 backupStatusTitle.text = getString(R.string.onboarding_backup_found_title)
-                backupStatusTitle.setTextColor(ContextCompat.getColor(this, R.color.color_success_green))
+                backupStatusTitle.setTextColor(ContextCompat.getColor(this, R.color.numo_fluorescent_green))
 
                 val dateStr = backupTimestamp?.let {
                     SimpleDateFormat("MMM d, yyyy 'at' h:mm a", Locale.getDefault()).format(Date(it * 1000))
                 } ?: getString(R.string.restore_backup_unknown_date)
                 backupStatusSubtitle.text = getString(R.string.onboarding_backup_found_subtitle, dateStr)
             } else {
-                backupStatusCard.background = ContextCompat.getDrawable(this, R.drawable.bg_info_card)
+                backupStatusCard.setBackgroundColor(ContextCompat.getColor(this, R.color.numo_navy))
                 backupStatusIcon.setImageResource(R.drawable.ic_cloud_off)
-                backupStatusIcon.setColorFilter(ContextCompat.getColor(this, R.color.color_text_tertiary))
+                backupStatusIcon.setColorFilter(android.graphics.Color.parseColor("#73FFFFFF"))
                 backupStatusTitle.text = getString(R.string.onboarding_backup_not_found_title)
-                backupStatusTitle.setTextColor(ContextCompat.getColor(this, R.color.color_text_primary))
+                backupStatusTitle.setTextColor(android.graphics.Color.WHITE)
                 backupStatusSubtitle.text = getString(R.string.onboarding_backup_not_found_subtitle)
             }
-            mintsSubtitle.text = getString(R.string.onboarding_mints_subtitle_restore)
             mintsContinueButton.text = getString(R.string.onboarding_mints_continue_restore)
         } else {
             backupStatusCard.visibility = View.GONE
-            mintsSubtitle.text = getString(R.string.onboarding_mints_subtitle_description)
             mintsContinueButton.text = getString(R.string.onboarding_mints_continue_new_wallet)
         }
 
-        // Update mints list
-        mintsListContainer.removeAllViews()
-
-        val sortedMints = discoveredMints.sortedBy { resolveOnboardingMintDisplayName(it).lowercase() }
-        for (mintUrl in sortedMints) {
-            val mintView = createMintSelectionView(mintUrl, selectedMints.contains(mintUrl))
-            mintsListContainer.addView(mintView)
-        }
+        // Populate the RecyclerView adapter
+        // First mint is the default, rest are popular
+        val mintList = discoveredMints.toList()
+        val defaultMint = mintList.firstOrNull() ?: return
+        val popularMints = mintList.drop(1)
+        // All popular mints start as accepted
+        val acceptedMints = selectedMints.filter { it != defaultMint }.toSet()
 
-        updateMintsCount()
+        mintAdapter.setMints(defaultMint, popularMints, acceptedMints)
+        updateContinueButtonState()
     }
 
-    private fun createMintSelectionView(mintUrl: String, isSelected: Boolean): View {
-        val container = LinearLayout(this).apply {
-            orientation = LinearLayout.HORIZONTAL
-            gravity = android.view.Gravity.CENTER_VERTICAL
-            setPadding(16.dpToPx(), 14.dpToPx(), 16.dpToPx(), 14.dpToPx())
-            background = ContextCompat.getDrawable(context, R.drawable.bg_mint_item)
-            layoutParams = LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-            ).apply {
-                bottomMargin = 8.dpToPx()
+    private fun showAddMintBottomSheet() {
+        val sheet = AddMintBottomSheet.newInstance(object : AddMintBottomSheet.Listener {
+            override fun onAddMintUrl(url: String) {
+                addDifferentMint(url)
             }
-        }
-
-        val mintIcon = ShapeableImageView(this).apply {
-            layoutParams = LinearLayout.LayoutParams(42.dpToPx(), 42.dpToPx())
-            setImageResource(R.drawable.ic_bitcoin)
-            setColorFilter(ContextCompat.getColor(context, R.color.color_primary))
-            scaleType = ImageView.ScaleType.CENTER_CROP
-            setBackgroundColor(ContextCompat.getColor(context, R.color.color_bg_tertiary))
-            shapeAppearanceModel = shapeAppearanceModel.toBuilder()
-                .setAllCornerSizes(21.dpToPx().toFloat())
-                .build()
-        }
-        loadMintIcon(mintUrl, mintIcon)
-
-        val nameText = TextView(this).apply {
-            text = resolveOnboardingMintDisplayName(mintUrl)
-            layoutParams = LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f).apply {
-                marginEnd = 14.dpToPx()
-                marginStart = 14.dpToPx()
+            override fun onScanQrCode() {
+                openOnboardingMintQrScanner()
             }
-            setTextColor(ContextCompat.getColor(context, R.color.color_text_primary))
-            textSize = 16f
-            typeface = android.graphics.Typeface.create("sans-serif-medium", android.graphics.Typeface.NORMAL)
-            maxLines = 1
-            ellipsize = android.text.TextUtils.TruncateAt.END
-        }
-
-        val checkbox = ImageView(this).apply {
-            layoutParams = LinearLayout.LayoutParams(24.dpToPx(), 24.dpToPx())
-            updateCheckboxState(this, isSelected)
-        }
-
-        container.addView(mintIcon)
-        container.addView(nameText)
-        container.addView(checkbox)
+        })
+        addMintBottomSheet = sheet
+        sheet.show(supportFragmentManager, "AddMintBottomSheet")
+    }
 
-        container.setOnClickListener {
-            val nowSelected = !selectedMints.contains(mintUrl)
-            if (nowSelected) {
-                selectedMints.add(mintUrl)
-            } else {
-                selectedMints.remove(mintUrl)
+    private fun showSetDefaultConfirmationDialog(mintUrl: String, mintName: String) {
+        AlertDialog.Builder(this)
+            .setTitle(getString(R.string.onboarding_mints_set_default_title))
+            .setMessage(getString(R.string.onboarding_mints_set_default_message, mintName))
+            .setPositiveButton(getString(R.string.onboarding_mints_set_default_confirm)) { _, _ ->
+                mintAdapter.confirmSetDefault(mintUrl)
+                updateContinueButtonState()
             }
-            updateCheckboxState(checkbox, nowSelected)
-            updateMintsCount()
-        }
+            .setNegativeButton(getString(R.string.onboarding_mints_set_default_cancel), null)
+            .show()
+    }
 
-        return container
+    private fun updateContinueButtonState() {
+        val totalSelected = mintAdapter.getAllSelectedMints().size
+        mintsContinueButton.isEnabled = totalSelected > 0
+        mintsContinueButton.alpha = if (totalSelected > 0) 1f else 0.35f
     }
 
     private fun loadMintIcon(mintUrl: String, iconView: ShapeableImageView) {
@@ -1064,9 +1340,22 @@ class OnboardingActivity : AppCompatActivity() {
         }
     }
 
+    /**
+     * Pings each mint in parallel and returns only the ones that respond successfully.
+     * Falls back to the full list if all mints are unreachable.
+     */
+    private suspend fun filterHealthyMints(mints: List<String>): List<String> =
+        withContext(Dispatchers.IO) {
+            val results = mints.map { url ->
+                async { url to mintProfileService.validateMintUrl(url).isValid }
+            }.awaitAll()
+            val healthy = results.filter { it.second }.map { it.first }
+            healthy.ifEmpty { mints } // fall back to full list if none reachable
+        }
+
     private fun refreshMintProfilesForReview() {
-        val sortedMints = discoveredMints.toList().sorted()
-        for (mintUrl in sortedMints) {
+        val mintsList = discoveredMints.toList()
+        for (mintUrl in mintsList) {
             lifecycleScope.launch {
                 val result = mintProfileService.fetchAndStoreMintProfile(mintUrl, validateEndpoint = false)
 
@@ -1076,7 +1365,8 @@ class OnboardingActivity : AppCompatActivity() {
                 onboardingMintDisplayNames[mintUrl] = displayName
 
                 if (currentStep == OnboardingStep.REVIEW_MINTS) {
-                    updateReviewMintsUI()
+                    // Notify adapter to refresh name display for this mint
+                    mintAdapter.notifyDataSetChanged()
                 }
             }
         }
@@ -1102,14 +1392,14 @@ class OnboardingActivity : AppCompatActivity() {
             return
         }
 
-        addDifferentMintCard.setLoading(true)
+        addMintBottomSheet?.setLoading(true)
 
         lifecycleScope.launch {
             val validation = withContext(Dispatchers.IO) {
                 mintProfileService.validateMintUrl(normalizedInput)
             }
             if (!validation.isValid || validation.normalizedUrl == null) {
-                addDifferentMintCard.setLoading(false)
+                addMintBottomSheet?.setLoading(false)
                 Toast.makeText(
                     this@OnboardingActivity,
                     getString(R.string.mints_invalid_url),
@@ -1120,7 +1410,7 @@ class OnboardingActivity : AppCompatActivity() {
 
             val mintUrl = validation.normalizedUrl
             if (discoveredMints.contains(mintUrl)) {
-                addDifferentMintCard.setLoading(false)
+                addMintBottomSheet?.setLoading(false)
                 Toast.makeText(
                     this@OnboardingActivity,
                     getString(R.string.mints_already_exists),
@@ -1141,10 +1431,12 @@ class OnboardingActivity : AppCompatActivity() {
             discoveredMints.add(mintUrl)
             selectedMints.add(mintUrl)
 
-            updateReviewMintsUI()
-            addDifferentMintCard.setLoading(false)
-            addDifferentMintCard.clearInput()
-            addDifferentMintCard.collapseIfExpanded()
+            // Add as default — user manually added this mint, so they likely want it as default
+            mintAdapter.addMintAsDefault(mintUrl)
+            updateContinueButtonState()
+
+            addMintBottomSheet?.dismiss()
+            addMintBottomSheet = null
             Toast.makeText(
                 this@OnboardingActivity,
                 getString(R.string.mints_added_toast),
@@ -1155,7 +1447,10 @@ class OnboardingActivity : AppCompatActivity() {
 
     private fun applySelectedMintsToMintManager() {
         val mintManager = MintManager.getInstance(this)
-        val normalizedSelected = selectedMints
+
+        // Get selected mints from the adapter (default + accepted popular)
+        val allSelected = mintAdapter.getAllSelectedMints()
+        val normalizedSelected = allSelected
             .map { mintProfileService.normalizeUrl(it) }
             .filter { it.isNotBlank() }
             .toSet()
@@ -1171,32 +1466,13 @@ class OnboardingActivity : AppCompatActivity() {
             mintManager.addMint(mintUrl)
         }
 
-        val preferredMint = discoveredMints.firstOrNull { normalizedSelected.contains(it) }
-            ?: normalizedSelected.sorted().firstOrNull()
-        if (preferredMint != null) {
+        // The default mint (index 0 in adapter) becomes the preferred Lightning mint
+        val preferredMint = mintAdapter.getDefaultMintUrl().let { mintProfileService.normalizeUrl(it) }
+        if (preferredMint.isNotBlank()) {
             mintManager.setPreferredLightningMint(preferredMint)
         }
     }
 
-    private fun updateCheckboxState(checkbox: ImageView, isSelected: Boolean) {
-        if (isSelected) {
-            checkbox.setImageResource(R.drawable.ic_checkbox_checked)
-            checkbox.setColorFilter(ContextCompat.getColor(this, R.color.color_success_green))
-        } else {
-            checkbox.setImageResource(R.drawable.ic_checkbox_unchecked)
-            checkbox.setColorFilter(ContextCompat.getColor(this, R.color.color_text_tertiary))
-        }
-    }
-
-    private fun updateMintsCount() {
-        val count = selectedMints.size
-        val pluralSuffix = if (count != 1) "s" else ""
-        mintsCountText.text = getString(R.string.onboarding_mints_count, count, pluralSuffix)
-
-        mintsContinueButton.isEnabled = count > 0
-        mintsContinueButton.alpha = if (count > 0) 1f else 0.5f
-    }
-
     // === Restore Progress ===
 
     private fun createMintProgressView(mintUrl: String): View {
@@ -1228,7 +1504,7 @@ class OnboardingActivity : AppCompatActivity() {
                 FrameLayout.LayoutParams.MATCH_PARENT
             )
             isIndeterminate = true
-            indeterminateTintList = ContextCompat.getColorStateList(context, R.color.color_text_tertiary)
+            indeterminateTintList = ContextCompat.getColorStateList(context, R.color.numo_fluorescent_green)
         }
 
         val statusIcon = ImageView(this).apply {
@@ -1250,7 +1526,7 @@ class OnboardingActivity : AppCompatActivity() {
 
         val nameText = TextView(this).apply {
             text = mintManager.getMintDisplayName(mintUrl)
-            setTextColor(ContextCompat.getColor(context, R.color.color_text_primary))
+            setTextColor(android.graphics.Color.WHITE)
             textSize = 15f
             typeface = android.graphics.Typeface.create("sans-serif-medium", android.graphics.Typeface.NORMAL)
             tag = "name"
@@ -1258,7 +1534,7 @@ class OnboardingActivity : AppCompatActivity() {
 
         val statusText = TextView(this).apply {
             text = getString(R.string.restore_progress_status_waiting)
-            setTextColor(ContextCompat.getColor(context, R.color.color_text_tertiary))
+            setTextColor(android.graphics.Color.parseColor("#73FFFFFF"))
             textSize = 13f
             tag = "status"
         }
@@ -1305,7 +1581,7 @@ class OnboardingActivity : AppCompatActivity() {
                 spinner?.visibility = View.GONE
                 statusIcon?.visibility = View.VISIBLE
                 statusIcon?.setImageResource(R.drawable.ic_check)
-                statusIcon?.setColorFilter(ContextCompat.getColor(this, R.color.color_success_green))
+                statusIcon?.setColorFilter(ContextCompat.getColor(this, R.color.numo_fluorescent_green))
 
                 val diff = after - before
                 if (diff != 0L) {
@@ -1316,7 +1592,7 @@ class OnboardingActivity : AppCompatActivity() {
                     balanceText?.setTextColor(
                         ContextCompat.getColor(
                             this,
-                            if (diff >= 0) R.color.color_success_green else R.color.color_warning_red
+                            if (diff >= 0) R.color.numo_fluorescent_green else R.color.color_warning_red
                         )
                     )
                 }
@@ -1399,14 +1675,14 @@ class OnboardingActivity : AppCompatActivity() {
 
         val nameText = TextView(this).apply {
             text = mintManager.getMintDisplayName(mintUrl)
-            setTextColor(ContextCompat.getColor(context, R.color.color_text_primary))
+            setTextColor(android.graphics.Color.WHITE)
             textSize = 15f
             typeface = android.graphics.Typeface.create("sans-serif-medium", android.graphics.Typeface.NORMAL)
         }
 
         val detailText = TextView(this).apply {
             text = getString(R.string.restore_success_balance_line, after)
-            setTextColor(ContextCompat.getColor(context, R.color.color_text_secondary))
+            setTextColor(android.graphics.Color.parseColor("#99FFFFFF"))
             textSize = 13f
         }
 
@@ -1419,9 +1695,9 @@ class OnboardingActivity : AppCompatActivity() {
                 ContextCompat.getColor(
                     context,
                     when {
-                        diff > 0 -> R.color.color_success_green
+                        diff > 0 -> R.color.numo_fluorescent_green
                         diff < 0 -> R.color.color_warning_red
-                        else -> R.color.color_text_secondary
+                        else -> R.color.numo_fluorescent_green
                     }
                 )
             )
@@ -1463,6 +1739,8 @@ class OnboardingActivity : AppCompatActivity() {
         val intent = Intent(this, ModernPOSActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
         startActivity(intent)
+        @Suppress("DEPRECATION")
+        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
         finish()
     }
 
diff --git a/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingMintAdapter.kt b/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingMintAdapter.kt
new file mode 100644
index 00000000..238697b9
--- /dev/null
+++ b/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingMintAdapter.kt
@@ -0,0 +1,325 @@
+package com.electricdreams.numo.feature.onboarding
+
+import android.annotation.SuppressLint
+import android.view.HapticFeedbackConstants
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import com.electricdreams.numo.R
+import com.google.android.material.imageview.ShapeableImageView
+
+class OnboardingMintAdapter(
+    private val listener: Listener
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    interface Listener {
+        fun onLoadMintIcon(mintUrl: String, iconView: ShapeableImageView)
+        fun onResolveMintName(mintUrl: String): String
+        fun onMintAcceptedChanged()
+        fun onDefaultMintChanged(newDefaultUrl: String)
+        fun onAddMintClicked()
+        fun onRequestSetDefault(mintUrl: String, mintName: String)
+    }
+
+    sealed class ListItem {
+        data class Header(val title: String, val acceptedCount: Int) : ListItem()
+        data class DefaultHero(val url: String) : ListItem()
+        data class Mint(val url: String) : ListItem()
+        object Hint : ListItem()
+        object AddMint : ListItem()
+    }
+
+    companion object {
+        private const val VIEW_TYPE_HEADER = 0
+        private const val VIEW_TYPE_MINT = 1
+        private const val VIEW_TYPE_DEFAULT_HERO = 2
+        private const val VIEW_TYPE_HINT = 3
+        private const val VIEW_TYPE_ADD_MINT = 4
+    }
+
+    private val items = mutableListOf<ListItem>()
+    private val mints = mutableListOf<String>()
+    val accepted = mutableSetOf<String>()
+
+    private var acceptFromTitle = ""
+
+    fun setHeaderStrings(acceptFromTitle: String) {
+        this.acceptFromTitle = acceptFromTitle
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun setMints(defaultUrl: String, popularUrls: List<String>, acceptedUrls: Set<String>) {
+        mints.clear()
+        mints.add(defaultUrl)
+        mints.addAll(popularUrls)
+        accepted.clear()
+        accepted.addAll(acceptedUrls)
+        rebuildItems()
+        notifyDataSetChanged()
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun addMint(url: String) {
+        mints.add(url)
+        accepted.add(url)
+        rebuildItems()
+        notifyDataSetChanged()
+    }
+
+    @SuppressLint("NotifyDataSetChanged")
+    fun addMintAsDefault(url: String) {
+        val oldDefault = mints.firstOrNull()
+        if (oldDefault != null) {
+            accepted.add(oldDefault)
+        }
+        mints.add(0, url)
+        rebuildItems()
+        notifyDataSetChanged()
+        listener.onDefaultMintChanged(url)
+    }
+
+    private fun rebuildItems() {
+        items.clear()
+        if (mints.isNotEmpty()) {
+            items.add(ListItem.DefaultHero(mints[0]))
+        }
+        items.add(ListItem.Header(acceptFromTitle, accepted.size))
+        for (i in 1 until mints.size) {
+            items.add(ListItem.Mint(mints[i]))
+        }
+        items.add(ListItem.Hint)
+        items.add(ListItem.AddMint)
+    }
+
+    fun getDefaultMintUrl(): String {
+        return mints.firstOrNull() ?: ""
+    }
+
+    fun getPopularMints(): List<String> {
+        return mints.drop(1)
+    }
+
+    fun getAcceptedMints(): Set<String> = accepted.toSet()
+
+    fun getAllSelectedMints(): Set<String> {
+        val result = mutableSetOf<String>()
+        // Default mint is always selected
+        mints.firstOrNull()?.let { result.add(it) }
+        // Plus all accepted popular mints
+        result.addAll(accepted)
+        return result
+    }
+
+    /**
+     * Called by the Activity after the user confirms via the set-default dialog.
+     */
+    fun confirmSetDefault(mintUrl: String) {
+        val mintIndex = mints.indexOf(mintUrl)
+        if (mintIndex > 0) {
+            swapToDefault(mintIndex)
+        }
+    }
+
+    /**
+     * Swaps a popular mint with the current default mint.
+     * Updates the hero card and the swapped popular mint row.
+     */
+    private fun swapToDefault(tappedMintIndex: Int) {
+        if (tappedMintIndex < 1 || tappedMintIndex >= mints.size) return
+
+        val oldDefault = mints[0]
+        val newDefault = mints[tappedMintIndex]
+
+        // Old default becomes popular — add to accepted (was implicitly always on)
+        accepted.add(oldDefault)
+        // New default loses checkbox — remove from accepted set
+        accepted.remove(newDefault)
+
+        // Swap in the data list
+        mints[0] = newDefault
+        mints[tappedMintIndex] = oldDefault
+
+        // Adapter positions:
+        // [0] = DefaultHero
+        // [1] = Header "ACCEPT FROM"
+        // [2..] = popular mints (mints[i] is at adapter position i + 1)
+        val tappedAdapterPos = tappedMintIndex + 1
+
+        rebuildItems()
+        notifyItemChanged(0)               // Hero card shows new default
+        notifyItemChanged(1)               // Header count may change
+        notifyItemChanged(tappedAdapterPos) // Swapped popular mint row
+
+        listener.onDefaultMintChanged(newDefault)
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    override fun getItemViewType(position: Int): Int = when (items[position]) {
+        is ListItem.Header -> VIEW_TYPE_HEADER
+        is ListItem.DefaultHero -> VIEW_TYPE_DEFAULT_HERO
+        is ListItem.Mint -> VIEW_TYPE_MINT
+        is ListItem.Hint -> VIEW_TYPE_HINT
+        is ListItem.AddMint -> VIEW_TYPE_ADD_MINT
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return when (viewType) {
+            VIEW_TYPE_HEADER -> {
+                val view = inflater.inflate(R.layout.item_onboarding_mint_header, parent, false)
+                HeaderViewHolder(view)
+            }
+            VIEW_TYPE_DEFAULT_HERO -> {
+                val view = inflater.inflate(R.layout.item_onboarding_mint_hero, parent, false)
+                DefaultHeroViewHolder(view)
+            }
+            VIEW_TYPE_HINT -> {
+                val view = inflater.inflate(R.layout.item_onboarding_mint_hint, parent, false)
+                HintViewHolder(view)
+            }
+            VIEW_TYPE_ADD_MINT -> {
+                val view = inflater.inflate(R.layout.item_onboarding_mint_add, parent, false)
+                AddMintViewHolder(view)
+            }
+            else -> {
+                val view = inflater.inflate(R.layout.item_onboarding_mint, parent, false)
+                MintViewHolder(view)
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val context = holder.itemView.context
+        val density = context.resources.displayMetrics.density
+
+        when (val item = items[position]) {
+            is ListItem.Header -> {
+                val h = holder as HeaderViewHolder
+                h.title.text = item.title
+
+                h.count.text = if (item.acceptedCount == 1) {
+                    context.getString(R.string.onboarding_mints_count_label_singular, item.acceptedCount)
+                } else {
+                    context.getString(R.string.onboarding_mints_count_label, item.acceptedCount)
+                }
+
+                val lp = h.itemView.layoutParams as RecyclerView.LayoutParams
+                lp.topMargin = (20 * density).toInt()
+                h.itemView.layoutParams = lp
+            }
+            is ListItem.DefaultHero -> {
+                val h = holder as DefaultHeroViewHolder
+                h.mintName.text = listener.onResolveMintName(item.url)
+
+                // Mint icon with rounded corners
+                h.mintIcon.setImageResource(R.drawable.ic_bitcoin)
+                h.mintIcon.setColorFilter(ContextCompat.getColor(context, R.color.color_primary))
+                h.mintIcon.setBackgroundColor(android.graphics.Color.parseColor("#1AFFFFFF"))
+                h.mintIcon.shapeAppearanceModel = h.mintIcon.shapeAppearanceModel.toBuilder()
+                    .setAllCornerSizes(22f * density)
+                    .build()
+                listener.onLoadMintIcon(item.url, h.mintIcon)
+            }
+            is ListItem.Mint -> {
+                val h = holder as MintViewHolder
+
+                h.name.text = listener.onResolveMintName(item.url)
+
+                // Icon
+                h.icon.setImageResource(R.drawable.ic_bitcoin)
+                h.icon.setColorFilter(ContextCompat.getColor(context, R.color.color_primary))
+                h.icon.setBackgroundColor(android.graphics.Color.parseColor("#1AFFFFFF"))
+                h.icon.shapeAppearanceModel = h.icon.shapeAppearanceModel.toBuilder()
+                    .setAllCornerSizes(20f * density)
+                    .build()
+                listener.onLoadMintIcon(item.url, h.icon)
+
+                val lp = h.itemView.layoutParams as RecyclerView.LayoutParams
+                h.itemView.background =
+                    ContextCompat.getDrawable(context, R.drawable.bg_mint_item)
+                lp.bottomMargin = (8 * density).toInt()
+
+                // Status text and checkbox
+                val isAccepted = accepted.contains(item.url)
+                updateMintRowState(context, h, isAccepted)
+
+                // Checkbox toggle on row tap
+                h.itemView.setOnClickListener {
+                    val nowAccepted = !accepted.contains(item.url)
+                    if (nowAccepted) accepted.add(item.url) else accepted.remove(item.url)
+                    updateMintRowState(context, h, nowAccepted)
+                    // Update the header count
+                    rebuildItems()
+                    notifyItemChanged(1)
+                    listener.onMintAcceptedChanged()
+                }
+
+                // Long-press to set as default
+                h.itemView.setOnLongClickListener { view ->
+                    view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
+                    val mintName = listener.onResolveMintName(item.url)
+                    listener.onRequestSetDefault(item.url, mintName)
+                    true
+                }
+
+                h.itemView.layoutParams = lp
+            }
+            is ListItem.Hint -> {
+                // Static text — no binding needed
+            }
+            is ListItem.AddMint -> {
+                val h = holder as AddMintViewHolder
+                h.addText.setOnClickListener {
+                    listener.onAddMintClicked()
+                }
+            }
+        }
+
+    }
+
+    private fun updateMintRowState(
+        context: android.content.Context,
+        holder: MintViewHolder,
+        isAccepted: Boolean
+    ) {
+        if (isAccepted) {
+            holder.checkbox.setImageResource(R.drawable.ic_checkbox_checked)
+            holder.checkbox.setColorFilter(android.graphics.Color.WHITE)
+            holder.status.text = context.getString(R.string.onboarding_mints_status_accepting)
+            holder.status.setTextColor(android.graphics.Color.parseColor("#99FFFFFF"))
+        } else {
+            holder.checkbox.setImageResource(R.drawable.ic_checkbox_unchecked)
+            holder.checkbox.setColorFilter(android.graphics.Color.parseColor("#4DFFFFFF"))
+            holder.status.text = context.getString(R.string.onboarding_mints_status_not_accepting)
+            holder.status.setTextColor(android.graphics.Color.parseColor("#73FFFFFF"))
+        }
+    }
+
+    class HeaderViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val title: TextView = view.findViewById(R.id.header_title)
+        val count: TextView = view.findViewById(R.id.header_count)
+    }
+
+    class DefaultHeroViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val mintIcon: ShapeableImageView = view.findViewById(R.id.hero_mint_icon)
+        val mintName: TextView = view.findViewById(R.id.hero_mint_name)
+    }
+
+    class MintViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val icon: ShapeableImageView = view.findViewById(R.id.mint_icon)
+        val name: TextView = view.findViewById(R.id.mint_name)
+        val status: TextView = view.findViewById(R.id.mint_status)
+        val checkbox: ImageView = view.findViewById(R.id.mint_checkbox)
+    }
+
+    class HintViewHolder(view: View) : RecyclerView.ViewHolder(view)
+
+    class AddMintViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        val addText: TextView = view.findViewById(R.id.add_mint_text)
+    }
+}
diff --git a/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingWelcomeAnimator.kt b/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingWelcomeAnimator.kt
index ca4a1cc0..000b2109 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingWelcomeAnimator.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/onboarding/OnboardingWelcomeAnimator.kt
@@ -9,6 +9,7 @@ import android.animation.ValueAnimator
 import android.app.Activity
 import android.content.res.ColorStateList
 import android.graphics.Color
+import android.graphics.Rect
 import android.graphics.drawable.GradientDrawable
 import android.view.Gravity
 import android.view.View
@@ -46,6 +47,7 @@ class OnboardingWelcomeAnimator(
     private val activity: Activity,
     private val container: FrameLayout,
     private val wordmark: ImageView,
+    private val wordmarkGreen: ImageView,
     private val tagline: TextView,
     private val acceptButton: MaterialButton,
     private val termsText: TextView,
@@ -161,9 +163,10 @@ class OnboardingWelcomeAnimator(
                 delay(200)
                 startPhase3_CircleExpansion()
                 startPhase4_ColorTransition()
-                delay(600)
-                startPhase5_ScrollingRows()
+                delay(400)
                 startPhase6_CtaReveal()
+                delay(800)
+                startPhase4b_GreenFill()
             }
         }
     }
@@ -201,6 +204,9 @@ class OnboardingWelcomeAnimator(
         wordmark.scaleX = 0.95f
         wordmark.scaleY = 0.95f
 
+        wordmarkGreen.alpha = 0f
+        wordmarkGreen.clipBounds = null
+
         tagline.setTextColor(navyColor)
         tagline.alpha = 0f
         tagline.translationY = 15f
@@ -259,7 +265,12 @@ class OnboardingWelcomeAnimator(
 
     private suspend fun startPhase3_CircleExpansion() {
         val centerX = emojiContainer.width / 2f
-        val centerY = emojiContainer.height / 2f
+        // Center on the wordmark, not the screen center
+        val wordmarkLocation = IntArray(2)
+        wordmark.getLocationInWindow(wordmarkLocation)
+        val containerLocation = IntArray(2)
+        emojiContainer.getLocationInWindow(containerLocation)
+        val centerY = (wordmarkLocation[1] - containerLocation[1]).toFloat() + wordmark.height / 2f
         val density = activity.resources.displayMetrics.density
         val radius = min(emojiContainer.width, emojiContainer.height) * 0.30f
 
@@ -326,7 +337,12 @@ class OnboardingWelcomeAnimator(
 
     private suspend fun startCircleBurst() = suspendCancellableCoroutine<Unit> { cont ->
         val centerX = emojiContainer.width / 2f
-        val centerY = emojiContainer.height / 2f
+        // Match the circle center used in phase 3
+        val wordmarkLocation = IntArray(2)
+        wordmark.getLocationInWindow(wordmarkLocation)
+        val containerLocation = IntArray(2)
+        emojiContainer.getLocationInWindow(containerLocation)
+        val centerY = (wordmarkLocation[1] - containerLocation[1]).toFloat() + wordmark.height / 2f
         var completedCount = 0
         val phaseAnimators = mutableListOf<Animator>()
 
@@ -406,6 +422,28 @@ class OnboardingWelcomeAnimator(
         trackAndStart(colorAnim)
     }
 
+    // === Phase 4b: Green Color Fill (800ms) ===
+
+    private suspend fun startPhase4b_GreenFill() = suspendCancellableCoroutine<Unit> { cont ->
+        val w = wordmarkGreen.width
+        val h = wordmarkGreen.height
+        if (w == 0 || h == 0) { if (cont.isActive) cont.resume(Unit); return@suspendCancellableCoroutine }
+
+        wordmarkGreen.alpha = 1f
+        wordmarkGreen.clipBounds = Rect(0, 0, 0, h)
+
+        val fillAnim = ValueAnimator.ofInt(0, w).apply {
+            duration = 3000
+            interpolator = AccelerateDecelerateInterpolator()
+            addUpdateListener {
+                wordmarkGreen.clipBounds = Rect(0, 0, it.animatedValue as Int, h)
+            }
+            addListener(onEnd { if (cont.isActive) cont.resume(Unit) })
+        }
+        cont.invokeOnCancellation { fillAnim.cancel() }
+        trackAndStart(fillAnim)
+    }
+
     // === Phase 5: Scrolling Rows Fade In (800ms) ===
 
     private suspend fun startPhase5_ScrollingRows() {
diff --git a/app/src/main/java/com/electricdreams/numo/feature/onboarding/ZeroFeesIllustration.kt b/app/src/main/java/com/electricdreams/numo/feature/onboarding/ZeroFeesIllustration.kt
new file mode 100644
index 00000000..4b30b38b
--- /dev/null
+++ b/app/src/main/java/com/electricdreams/numo/feature/onboarding/ZeroFeesIllustration.kt
@@ -0,0 +1,249 @@
+package com.electricdreams.numo.feature.onboarding
+
+import android.animation.AnimatorSet
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.*
+import android.util.AttributeSet
+import android.view.View
+import android.view.animation.AccelerateInterpolator
+import android.view.animation.DecelerateInterpolator
+import android.view.animation.OvershootInterpolator
+
+/**
+ * Animated "Zero Fees" illustration.
+ * Phase 1: Fee percentages fade in scattered around the screen.
+ * Phase 2: Each fee gets individually slashed — a line cuts through it,
+ *          then it splits apart and fades away, one after another.
+ * Phase 3: Large "0%" bounces in.
+ */
+class ZeroFeesIllustration @JvmOverloads constructor(
+    context: Context, attrs: AttributeSet? = null
+) : View(context, attrs) {
+
+    private data class FeeLabel(
+        val text: String,
+        val baseX: Float,   // 0..1 relative
+        val baseY: Float,
+        val size: Float,    // text size multiplier
+        var alpha: Float = 0f,
+        var slashProgress: Float = 0f,  // 0..1 line draw
+        var destroyed: Float = 0f       // 0..1 split + fade
+    )
+
+    private val fees = listOf(
+        FeeLabel("3%",   0.22f, 0.28f, 1.1f),
+        FeeLabel("2.5%", 0.70f, 0.24f, 0.85f),
+        FeeLabel("1.5%", 0.18f, 0.58f, 0.9f),
+        FeeLabel("2%",   0.68f, 0.54f, 1.0f),
+        FeeLabel("2.9%", 0.45f, 0.40f, 0.8f),
+    )
+
+    private var zeroAlpha = 0f
+    private var zeroScale = 0.5f
+
+    private var animStarted = false
+    private var animScheduled = false
+    private var animatorSet: AnimatorSet? = null
+    private var startRunnable: Runnable? = null
+
+    private val feePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.WHITE
+        textAlign = Paint.Align.CENTER
+        typeface = Typeface.create("sans-serif", Typeface.BOLD)
+    }
+
+    private val slashPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.parseColor("#BBFFFFFF")
+        style = Paint.Style.STROKE
+        strokeCap = Paint.Cap.ROUND
+    }
+
+    private val zeroPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.WHITE
+        textAlign = Paint.Align.CENTER
+        typeface = Typeface.create("sans-serif-black", Typeface.BOLD)
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        val w = width.toFloat()
+        val h = height.toFloat()
+        if (w == 0f || h == 0f) return
+        val cx = w / 2f
+        val cy = h * 0.45f
+        val s = w / 380f
+
+        for (fee in fees) {
+            if (fee.alpha < 0.01f) continue
+
+            val textSize = 34f * fee.size * s
+            feePaint.textSize = textSize
+            slashPaint.strokeWidth = 2.5f * s
+
+            val x = fee.baseX * w
+            val y = fee.baseY * h
+
+            // Measure text width for the slash line
+            val textW = feePaint.measureText(fee.text)
+            val fadeAlpha = fee.alpha * (1f - fee.destroyed)
+
+            if (fee.destroyed > 0.01f) {
+                // Split apart: top half up-left, bottom half down-right
+                val drift = fee.destroyed * 20f * s
+                val a = (fadeAlpha * 180).toInt().coerceIn(0, 255)
+
+                // Top half
+                canvas.save()
+                canvas.clipRect(x - textW, y - textSize * 1.2f, x + textW, y - textSize * 0.1f)
+                feePaint.alpha = a
+                canvas.translate(-drift * 0.4f, -drift)
+                canvas.drawText(fee.text, x, y, feePaint)
+                canvas.restore()
+
+                // Bottom half
+                canvas.save()
+                canvas.clipRect(x - textW, y - textSize * 0.1f, x + textW, y + textSize * 0.5f)
+                feePaint.alpha = a
+                canvas.translate(drift * 0.4f, drift)
+                canvas.drawText(fee.text, x, y, feePaint)
+                canvas.restore()
+            } else {
+                // Normal draw
+                feePaint.alpha = (fee.alpha * 180).toInt().coerceIn(0, 255)
+                canvas.drawText(fee.text, x, y, feePaint)
+            }
+
+            // Individual slash line across this fee
+            if (fee.slashProgress > 0f && fee.destroyed < 0.99f) {
+                val slashAlpha = ((1f - fee.destroyed) * 220).toInt()
+                slashPaint.alpha = slashAlpha
+                val sx = x - textW * 0.6f
+                val sy = y + 4f * s
+                val ex = x + textW * 0.6f
+                val ey = y - textSize * 0.7f
+
+                canvas.drawLine(
+                    sx, sy,
+                    sx + (ex - sx) * fee.slashProgress,
+                    sy + (ey - sy) * fee.slashProgress,
+                    slashPaint
+                )
+            }
+        }
+
+        // Draw "0%"
+        if (zeroAlpha > 0.01f) {
+            zeroPaint.textSize = 90f * s
+            zeroPaint.alpha = (zeroAlpha * 255).toInt()
+            canvas.save()
+            canvas.scale(zeroScale, zeroScale, cx, cy)
+            canvas.drawText("0%", cx, cy + 30f * s, zeroPaint)
+            canvas.restore()
+        }
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        scheduleAnimation()
+    }
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        if (w > 0 && h > 0) scheduleAnimation()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        startRunnable?.let { removeCallbacks(it) }
+        startRunnable = null
+        animatorSet?.removeAllListeners()
+        animatorSet?.cancel()
+        animatorSet = null
+        // Reset so animation replays fresh on re-attach
+        animStarted = false
+        animScheduled = false
+        zeroAlpha = 0f
+        zeroScale = 0.5f
+        fees.forEach { it.alpha = 0f; it.slashProgress = 0f; it.destroyed = 0f }
+    }
+
+    private fun scheduleAnimation() {
+        if (animScheduled || animStarted) return
+        if (width == 0 || height == 0) return
+        animScheduled = true
+        startRunnable = Runnable { startAnimation() }
+        postDelayed(startRunnable!!, 500)
+    }
+
+    private fun startAnimation() {
+        if (animStarted) return
+        animStarted = true
+
+        val animators = mutableListOf<android.animation.Animator>()
+
+        // Phase 1: All fees fade in (staggered)
+        val fadeIn = ValueAnimator.ofFloat(0f, 1f).apply {
+            duration = 600
+            interpolator = DecelerateInterpolator()
+            addUpdateListener {
+                val p = it.animatedValue as Float
+                fees.forEachIndexed { i, fee ->
+                    val stagger = i * 0.12f
+                    fee.alpha = ((p - stagger) / (1f - stagger)).coerceIn(0f, 1f)
+                }
+                invalidate()
+            }
+        }
+        animators.add(fadeIn)
+
+        // Phase 2: Each fee gets slashed individually (staggered)
+        fees.forEachIndexed { i, fee ->
+            val baseDelay = 1600L + i * 200L
+
+            // Slash line draws
+            val slash = ValueAnimator.ofFloat(0f, 1f).apply {
+                duration = 200
+                startDelay = baseDelay
+                interpolator = AccelerateInterpolator()
+                addUpdateListener {
+                    fee.slashProgress = it.animatedValue as Float
+                    invalidate()
+                }
+            }
+            animators.add(slash)
+
+            // Split + fade
+            val destroy = ValueAnimator.ofFloat(0f, 1f).apply {
+                duration = 350
+                startDelay = baseDelay + 150L
+                interpolator = AccelerateInterpolator(1.5f)
+                addUpdateListener {
+                    fee.destroyed = it.animatedValue as Float
+                    invalidate()
+                }
+            }
+            animators.add(destroy)
+        }
+
+        // Phase 3: "0%" bounces in after all fees are destroyed
+        val lastFeeEnd = 1600L + (fees.size - 1) * 200L + 150L + 350L
+        val zeroIn = ValueAnimator.ofFloat(0f, 1f).apply {
+            duration = 600
+            startDelay = lastFeeEnd + 300L
+            interpolator = OvershootInterpolator(1.5f)
+            addUpdateListener {
+                val p = it.animatedValue as Float
+                zeroAlpha = p
+                zeroScale = 0.5f + 0.5f * p
+                invalidate()
+            }
+        }
+        animators.add(zeroIn)
+
+        animatorSet = AnimatorSet().apply {
+            playTogether(animators)
+            start()
+        }
+    }
+}
diff --git a/app/src/main/java/com/electricdreams/numo/feature/settings/CurrencySettingsActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/settings/CurrencySettingsActivity.kt
index d3f237e8..23dc63f3 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/settings/CurrencySettingsActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/settings/CurrencySettingsActivity.kt
@@ -45,6 +45,7 @@ class CurrencySettingsActivity : AppCompatActivity() {
             val selectedCurrency = getSelectedCurrency()
             currencyManager.setPreferredCurrency(selectedCurrency)
         }
+
     }
 
     private fun setSelectedCurrency(currencyCode: String) {
diff --git a/app/src/main/java/com/electricdreams/numo/feature/settings/LanguageSettingsActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/settings/LanguageSettingsActivity.kt
index eb6259e5..fa01ac58 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/settings/LanguageSettingsActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/settings/LanguageSettingsActivity.kt
@@ -65,6 +65,7 @@ class LanguageSettingsActivity : AppCompatActivity() {
             applyLanguage(newCode)
             updateSummary(newCode)
         }
+
     }
 
     private fun applyLanguage(langCode: String) {
diff --git a/app/src/main/java/com/electricdreams/numo/feature/settings/MintDetailsActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/settings/MintDetailsActivity.kt
index f14e6101..1182b706 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/settings/MintDetailsActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/settings/MintDetailsActivity.kt
@@ -129,7 +129,6 @@ class MintDetailsActivity : AppCompatActivity() {
         initViews()
         setupListeners()
         loadMintDetails()
-        startEntranceAnimations()
     }
     
     override fun onStart() {
diff --git a/app/src/main/java/com/electricdreams/numo/feature/settings/MintsSettingsActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/settings/MintsSettingsActivity.kt
index 2564f502..76206bfd 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/settings/MintsSettingsActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/settings/MintsSettingsActivity.kt
@@ -6,6 +6,7 @@ import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.view.View
 import android.view.animation.DecelerateInterpolator
+import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
@@ -16,6 +17,7 @@ import android.widget.ScrollView
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -26,8 +28,8 @@ import com.electricdreams.numo.core.util.BalanceRefreshBroadcast
 import com.electricdreams.numo.core.util.MintIconCache
 import com.electricdreams.numo.core.util.MintManager
 import com.electricdreams.numo.core.util.MintProfileService
+import com.electricdreams.numo.feature.onboarding.AddMintBottomSheet
 import com.electricdreams.numo.feature.scanner.QRScannerActivity
-import com.electricdreams.numo.ui.components.AddMintInputCard
 import com.electricdreams.numo.ui.components.MintListItem
 import com.electricdreams.numo.ui.util.DialogHelper
 import androidx.appcompat.widget.SwitchCompat
@@ -55,7 +57,7 @@ class MintsSettingsActivity : AppCompatActivity() {
     private lateinit var backButton: ImageButton
     private lateinit var resetButton: ImageButton
     private lateinit var lightningMintSection: View
-    private lateinit var lightningMintCard: CardView
+    private lateinit var lightningMintCard: View
     private lateinit var lightningIconContainer: FrameLayout
     private lateinit var lightningMintIcon: ImageView
     private lateinit var lightningMintName: TextView
@@ -69,8 +71,8 @@ class MintsSettingsActivity : AppCompatActivity() {
     private lateinit var totalBalanceDivider: View
     private lateinit var mintsContainer: LinearLayout
     private lateinit var addMintHeader: TextView
-    private lateinit var addMintCard: AddMintInputCard
     private lateinit var emptyState: View
+    private lateinit var heroBolt: ImageView
     private lateinit var mintsScroll: ScrollView
 
     // State
@@ -93,7 +95,7 @@ class MintsSettingsActivity : AppCompatActivity() {
         if (result.resultCode == RESULT_OK) {
             val qrValue = result.data?.getStringExtra(QRScannerActivity.EXTRA_QR_VALUE)
             qrValue?.let { url ->
-                addMintCard.setMintUrl(mintProfileService.normalizeUrl(url))
+                addNewMint(mintProfileService.normalizeUrl(url))
             }
         }
     }
@@ -133,10 +135,10 @@ class MintsSettingsActivity : AppCompatActivity() {
         initViews()
         setupInsetHandling()
         swapUnknownMintsSwitch.isChecked = mintManager.isSwapFromUnknownMintsEnabled()
+        updateHeroBoltColor(mintManager.isSwapFromUnknownMintsEnabled())
 
         setupListeners()
         loadMintsAndBalances()
-        startEntranceAnimations()
     }
 
     override fun onStart() {
@@ -175,8 +177,8 @@ class MintsSettingsActivity : AppCompatActivity() {
         totalBalanceDivider = findViewById(R.id.total_balance_divider)
         mintsContainer = findViewById(R.id.mints_container)
         addMintHeader = findViewById(R.id.add_mint_header)
-        addMintCard = findViewById(R.id.add_mint_card)
         emptyState = findViewById(R.id.empty_state)
+        heroBolt = findViewById(R.id.hero_bolt)
     }
 
     /**
@@ -207,21 +209,26 @@ class MintsSettingsActivity : AppCompatActivity() {
 
         swapUnknownMintsSwitch.setOnCheckedChangeListener { _, isChecked ->
             mintManager.setSwapFromUnknownMintsEnabled(isChecked)
+            updateHeroBoltColor(isChecked)
         }
 
         resetButton.setOnClickListener {
             showResetConfirmation()
         }
 
-        addMintCard.setOnAddMintListener(object : AddMintInputCard.OnAddMintListener {
-            override fun onAddMint(mintUrl: String) {
-                addNewMint(mintUrl)
-            }
+        val addMintButton = findViewById<Button>(R.id.add_mint_button)
+        addMintButton.setOnClickListener {
+            val sheet = AddMintBottomSheet.newInstance(object : AddMintBottomSheet.Listener {
+                override fun onAddMintUrl(url: String) {
+                    addNewMint(url)
+                }
 
-            override fun onScanQR() {
-                openQRScanner()
-            }
-        })
+                override fun onScanQrCode() {
+                    openQRScanner()
+                }
+            })
+            sheet.show(supportFragmentManager, "add_mint")
+        }
     }
 
     private fun openQRScanner() {
@@ -309,9 +316,6 @@ class MintsSettingsActivity : AppCompatActivity() {
 
             mintsContainer.addView(item)
             mintItems[mintUrl] = item
-
-            // Staggered entrance animation
-            item.animateEntrance(index * 50L)
         }
     }
 
@@ -386,6 +390,11 @@ class MintsSettingsActivity : AppCompatActivity() {
         loadLightningMintIcon(url)
     }
 
+    private fun updateHeroBoltColor(enabled: Boolean) {
+        val boltColor = if (enabled) R.color.color_bitcoin_orange else R.color.color_success_green
+        heroBolt.setColorFilter(ContextCompat.getColor(this, boltColor))
+    }
+
     private fun loadLightningMintIcon(url: String) {
         val cachedFile = MintIconCache.getCachedIconFile(url)
         if (cachedFile != null) {
@@ -439,12 +448,13 @@ class MintsSettingsActivity : AppCompatActivity() {
             return
         }
 
-        addMintCard.setLoading(true)
+        val sheet = supportFragmentManager.findFragmentByTag("add_mint") as? AddMintBottomSheet
+        sheet?.setLoading(true)
 
         lifecycleScope.launch {
             val validation = mintProfileService.validateMintUrl(mintUrl)
             if (!validation.isValid || validation.normalizedUrl == null) {
-                addMintCard.setLoading(false)
+                sheet?.setLoading(false)
                 Toast.makeText(
                     this@MintsSettingsActivity,
                     getString(R.string.mints_invalid_url),
@@ -455,7 +465,7 @@ class MintsSettingsActivity : AppCompatActivity() {
 
             val normalizedUrl = validation.normalizedUrl
             if (mintManager.getAllowedMints().contains(normalizedUrl)) {
-                addMintCard.setLoading(false)
+                sheet?.setLoading(false)
                 Toast.makeText(
                     this@MintsSettingsActivity,
                     getString(R.string.mints_already_exists),
@@ -468,20 +478,19 @@ class MintsSettingsActivity : AppCompatActivity() {
             if (added) {
                 mintProfileService.fetchAndStoreMintProfile(normalizedUrl)
                 loadMintsAndBalances()
-                addMintCard.clearInput()
-                addMintCard.collapseIfExpanded()
-                
+                sheet?.dismiss()
+
                 // Broadcast that mints changed so other activities can refresh
                 BalanceRefreshBroadcast.send(this@MintsSettingsActivity, BalanceRefreshBroadcast.REASON_MINT_ADDED)
-                
+
                 Toast.makeText(
                     this@MintsSettingsActivity,
                     getString(R.string.mints_added_toast),
                     Toast.LENGTH_SHORT
                 ).show()
+            } else {
+                sheet?.setLoading(false)
             }
-            
-            addMintCard.setLoading(false)
         }
     }
 
@@ -536,18 +545,4 @@ class MintsSettingsActivity : AppCompatActivity() {
         allMintsHeader.visibility = View.VISIBLE
     }
 
-    private fun startEntranceAnimations() {
-        // Lightning mint section slide in
-        lightningMintSection.alpha = 0f
-        lightningMintSection.translationY = -30f
-        lightningMintSection.animate()
-            .alpha(1f)
-            .translationY(0f)
-            .setDuration(350)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
-
-        // Add mint card entrance
-        addMintCard.animateEntrance(400)
-    }
 }
diff --git a/app/src/main/java/com/electricdreams/numo/feature/settings/SecuritySettingsActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/settings/SecuritySettingsActivity.kt
index 9fbbf280..050cebe7 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/settings/SecuritySettingsActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/settings/SecuritySettingsActivity.kt
@@ -96,6 +96,7 @@ class SecuritySettingsActivity : AppCompatActivity() {
                 openRestoreWallet()
             }
         }
+
     }
 
     private fun updatePinUI() {
diff --git a/app/src/main/java/com/electricdreams/numo/feature/settings/ThemeSettingsActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/settings/ThemeSettingsActivity.kt
index d044eb49..d2b2cf98 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/settings/ThemeSettingsActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/settings/ThemeSettingsActivity.kt
@@ -60,6 +60,7 @@ class ThemeSettingsActivity : AppCompatActivity() {
             val selectedTheme = getSelectedTheme()
             saveTheme(selectedTheme)
         }
+
     }
 
     private fun getCurrentTheme(): String {
@@ -91,4 +92,3 @@ class ThemeSettingsActivity : AppCompatActivity() {
         PreferenceStore.app(this).putString(PREF_THEME, theme)
     }
 }
-
diff --git a/app/src/main/java/com/electricdreams/numo/feature/settings/WebhookSettingsActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/settings/WebhookSettingsActivity.kt
index fd05820e..a28071c6 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/settings/WebhookSettingsActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/settings/WebhookSettingsActivity.kt
@@ -17,6 +17,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.electricdreams.numo.R
+import com.electricdreams.numo.ui.components.EmptyStateHelper
 import com.electricdreams.numo.core.util.WebhookSettingsManager
 import com.electricdreams.numo.feature.history.PaymentsHistoryActivity
 import com.electricdreams.numo.feature.scanner.QRScannerActivity
@@ -42,7 +43,7 @@ class WebhookSettingsActivity : AppCompatActivity() {
 
     private lateinit var webhookSettingsManager: WebhookSettingsManager
     private lateinit var endpointsList: LinearLayout
-    private lateinit var emptyStateText: TextView
+    private lateinit var emptyStateText: View
     private lateinit var qrScannerLauncher: ActivityResultLauncher<Intent>
     private var currentDialog: AlertDialog? = null
     private var isSyncing: Boolean = false
@@ -85,7 +86,18 @@ class WebhookSettingsActivity : AppCompatActivity() {
         endpointsList.removeAllViews()
 
         val endpoints = webhookSettingsManager.getEndpoints()
-        emptyStateText.visibility = if (endpoints.isEmpty()) View.VISIBLE else View.GONE
+        val isEmpty = endpoints.isEmpty()
+        emptyStateText.visibility = if (isEmpty) View.VISIBLE else View.GONE
+        findViewById<View>(R.id.add_endpoint_button).visibility = if (isEmpty) View.GONE else View.VISIBLE
+        if (isEmpty) {
+            EmptyStateHelper.bind(
+                emptyStateText,
+                R.drawable.ic_link,
+                "No Endpoints",
+                "Add a webhook endpoint to feed sales data to external dashboards",
+                "+ Add Endpoint"
+            ) { showAddEndpointDialog() }
+        }
 
         val inflater = LayoutInflater.from(this)
         endpoints.forEachIndexed { index, endpoint ->
diff --git a/app/src/main/java/com/electricdreams/numo/feature/settings/WithdrawLightningActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/settings/WithdrawLightningActivity.kt
index ebd9afc5..1f607147 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/settings/WithdrawLightningActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/settings/WithdrawLightningActivity.kt
@@ -11,8 +11,6 @@ import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
 import android.view.View
-import android.view.animation.AccelerateDecelerateInterpolator
-import android.view.animation.OvershootInterpolator
 import android.widget.Button
 import android.widget.EditText
 import android.widget.FrameLayout
@@ -28,6 +26,7 @@ import androidx.lifecycle.lifecycleScope
 import com.electricdreams.numo.R
 import com.electricdreams.numo.core.cashu.CashuWalletManager
 import com.electricdreams.numo.core.model.Amount
+import com.electricdreams.numo.core.worker.BitcoinPriceWorker
 import com.electricdreams.numo.core.util.BalanceRefreshBroadcast
 import com.electricdreams.numo.core.util.LightningAddressManager
 import com.electricdreams.numo.core.util.MintManager
@@ -73,6 +72,7 @@ class WithdrawLightningActivity : AppCompatActivity() {
     private lateinit var balanceCard: MaterialCardView
     private lateinit var mintNameText: TextView
     private lateinit var balanceText: TextView
+    private lateinit var fiatBalanceText: TextView
     private lateinit var invoiceCard: WithdrawInvoiceCard
     private lateinit var addressCard: WithdrawAddressCard
     private lateinit var loadingOverlay: FrameLayout
@@ -136,7 +136,6 @@ class WithdrawLightningActivity : AppCompatActivity() {
         setupListeners()
         displayMintInfo()
         prefillFields()
-        startEntranceAnimations()
     }
 
     private fun initViews() {
@@ -144,6 +143,7 @@ class WithdrawLightningActivity : AppCompatActivity() {
         balanceCard = findViewById(R.id.balance_card)
         mintNameText = findViewById(R.id.mint_name_text)
         balanceText = findViewById(R.id.balance_text)
+        fiatBalanceText = findViewById(R.id.fiat_balance_text)
         invoiceCard = findViewById(R.id.invoice_card)
         addressCard = findViewById(R.id.address_card)
         loadingOverlay = findViewById(R.id.loading_overlay)
@@ -217,7 +217,6 @@ class WithdrawLightningActivity : AppCompatActivity() {
             override fun afterTextChanged(s: android.text.Editable?) {
                 val amount = s?.toString()?.toLongOrNull() ?: 0L
                 createTokenButton.isEnabled = amount > 0
-                createTokenButton.alpha = if (amount > 0) 1f else 0.5f
             }
         })
 
@@ -234,21 +233,21 @@ class WithdrawLightningActivity : AppCompatActivity() {
 
     private fun switchTab(isLightning: Boolean) {
         if (isLightning) {
-            tabLightning.setBackgroundResource(R.drawable.bg_segment_tab_selected)
-            tabLightning.setTextColor(getColor(R.color.color_text_primary))
-            
-            tabCashu.background = null
-            tabCashu.setTextColor(getColor(R.color.color_text_tertiary))
-            
+            tabLightning.setBackgroundResource(R.drawable.bg_button_primary_green)
+            tabLightning.setTextColor(getColor(R.color.color_bg_white))
+
+            tabCashu.setBackgroundResource(android.R.color.transparent)
+            tabCashu.setTextColor(getColor(R.color.color_text_secondary))
+
             lightningOptionsContainer.visibility = View.VISIBLE
             cashuTokenOptionsContainer.visibility = View.GONE
         } else {
-            tabCashu.setBackgroundResource(R.drawable.bg_segment_tab_selected)
-            tabCashu.setTextColor(getColor(R.color.color_text_primary))
-            
-            tabLightning.background = null
-            tabLightning.setTextColor(getColor(R.color.color_text_tertiary))
-            
+            tabCashu.setBackgroundResource(R.drawable.bg_button_primary_green)
+            tabCashu.setTextColor(getColor(R.color.color_bg_white))
+
+            tabLightning.setBackgroundResource(android.R.color.transparent)
+            tabLightning.setTextColor(getColor(R.color.color_text_secondary))
+
             lightningOptionsContainer.visibility = View.GONE
             cashuTokenOptionsContainer.visibility = View.VISIBLE
         }
@@ -365,6 +364,18 @@ class WithdrawLightningActivity : AppCompatActivity() {
 
         val balanceAmount = Amount(balance, Amount.Currency.BTC)
         balanceText.text = balanceAmount.toString()
+        updateFiatDisplay(balance)
+    }
+
+    private fun updateFiatDisplay(sats: Long) {
+        val priceWorker = BitcoinPriceWorker.getInstance(this)
+        val fiatAmount = priceWorker.satoshisToFiat(sats)
+        if (fiatAmount > 0) {
+            fiatBalanceText.text = priceWorker.formatFiatAmount(fiatAmount)
+            fiatBalanceText.visibility = android.view.View.VISIBLE
+        } else {
+            fiatBalanceText.visibility = android.view.View.GONE
+        }
     }
 
     private fun prefillFields() {
@@ -382,33 +393,6 @@ class WithdrawLightningActivity : AppCompatActivity() {
         }
     }
 
-    private fun startEntranceAnimations() {
-        // Balance card slide in from top
-        balanceCard.alpha = 0f
-        balanceCard.translationY = -40f
-        balanceCard.animate()
-            .alpha(1f)
-            .translationY(0f)
-            .setDuration(400)
-            .setInterpolator(AccelerateDecelerateInterpolator())
-            .start()
-
-        // Balance text scale
-        balanceText.scaleX = 0.8f
-        balanceText.scaleY = 0.8f
-        balanceText.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .setStartDelay(200)
-            .setDuration(350)
-            .setInterpolator(OvershootInterpolator(2f))
-            .start()
-
-        // Cards stagger entrance
-        invoiceCard.animateEntrance(300)
-        addressCard.animateEntrance(450)
-    }
-
     private fun processInvoice(invoice: String) {
         if (invoice.isBlank()) {
             Toast.makeText(
@@ -621,7 +605,8 @@ class WithdrawLightningActivity : AppCompatActivity() {
                         balance = newBalance
                         val balanceAmount = Amount(balance, Amount.Currency.BTC)
                         balanceText.text = balanceAmount.toString()
-                        
+                        updateFiatDisplay(balance)
+
                         // Update suggested amount in address card
                         val suggestedAmount = (balance * (1 - FEE_BUFFER_PERCENT)).toLong()
                         if (suggestedAmount > 0) {
diff --git a/app/src/main/java/com/electricdreams/numo/feature/tips/TipSelectionActivity.kt b/app/src/main/java/com/electricdreams/numo/feature/tips/TipSelectionActivity.kt
index 5e24bfcf..876c1348 100644
--- a/app/src/main/java/com/electricdreams/numo/feature/tips/TipSelectionActivity.kt
+++ b/app/src/main/java/com/electricdreams/numo/feature/tips/TipSelectionActivity.kt
@@ -99,7 +99,14 @@ class TipSelectionActivity : AppCompatActivity() {
         setupPresetButtons()
         setupCustomKeypad()
         setupClickListeners()
-        animateEntrance()
+
+        // Make all views visible immediately (no entrance animation)
+        val orderLabel = findViewById<View>(R.id.order_label)
+        orderLabel.alpha = 1f
+        amountDisplay.alpha = 1f
+        questionText.alpha = 1f
+        tipOptionsContainer.alpha = 1f
+        confirmButton.alpha = 0.4f // Start disabled
     }
 
     private fun setupWindowSettings() {
diff --git a/app/src/main/java/com/electricdreams/numo/ui/components/EmptyStateHelper.kt b/app/src/main/java/com/electricdreams/numo/ui/components/EmptyStateHelper.kt
new file mode 100644
index 00000000..428ae352
--- /dev/null
+++ b/app/src/main/java/com/electricdreams/numo/ui/components/EmptyStateHelper.kt
@@ -0,0 +1,32 @@
+package com.electricdreams.numo.ui.components
+
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import com.electricdreams.numo.R
+
+object EmptyStateHelper {
+
+    fun bind(
+        view: View,
+        icon: Int,
+        title: String,
+        description: String,
+        actionLabel: String? = null,
+        onAction: (() -> Unit)? = null
+    ) {
+        view.findViewById<ImageView>(R.id.empty_state_icon).setImageResource(icon)
+        view.findViewById<TextView>(R.id.empty_state_title).text = title
+        view.findViewById<TextView>(R.id.empty_state_description).text = description
+
+        val actionBtn = view.findViewById<TextView>(R.id.empty_state_action)
+        if (actionLabel != null && onAction != null) {
+            actionBtn.text = actionLabel
+            actionBtn.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_plus_small, 0, 0, 0)
+            actionBtn.visibility = View.VISIBLE
+            actionBtn.setOnClickListener { onAction() }
+        } else {
+            actionBtn.visibility = View.GONE
+        }
+    }
+}
diff --git a/app/src/main/java/com/electricdreams/numo/ui/components/LightningStrikeView.kt b/app/src/main/java/com/electricdreams/numo/ui/components/LightningStrikeView.kt
new file mode 100644
index 00000000..fef51aab
--- /dev/null
+++ b/app/src/main/java/com/electricdreams/numo/ui/components/LightningStrikeView.kt
@@ -0,0 +1,169 @@
+package com.electricdreams.numo.ui.components
+
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.BlurMaskFilter
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Path
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.AccelerateInterpolator
+import kotlin.math.cos
+import kotlin.math.sin
+import kotlin.random.Random
+
+/**
+ * Full-screen lightning strike overlay animation with realistic branching bolts.
+ * Add to the root layout, call [strike], and it auto-removes on completion.
+ */
+class LightningStrikeView(context: Context) : View(context) {
+
+    private var boltAlpha = 0f
+    private val branches = mutableListOf<BoltBranch>()
+
+    private data class BoltBranch(val path: Path, val depth: Int)
+
+    private val corePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.parseColor("#F7931A")
+        style = Paint.Style.STROKE
+        strokeCap = Paint.Cap.ROUND
+        strokeJoin = Paint.Join.ROUND
+    }
+
+    private val innerGlowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.parseColor("#FFBB5C")
+        style = Paint.Style.STROKE
+        strokeCap = Paint.Cap.ROUND
+        strokeJoin = Paint.Join.ROUND
+    }
+
+    private val outerGlowPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+        color = Color.parseColor("#FFCC80")
+        style = Paint.Style.STROKE
+        strokeCap = Paint.Cap.ROUND
+        strokeJoin = Paint.Join.ROUND
+    }
+
+    init {
+        setLayerType(LAYER_TYPE_SOFTWARE, null)
+    }
+
+    fun strike() {
+        post { generateBoltTree() }
+
+        // Fade in (0–120ms) → hold (120–250ms) → fade out (250–550ms)
+        ValueAnimator.ofFloat(0f, 1f, 1f, 0f).apply {
+            duration = 550
+            addUpdateListener {
+                boltAlpha = it.animatedValue as Float
+                invalidate()
+            }
+            start()
+        }
+
+        postDelayed({
+            (parent as? ViewGroup)?.removeView(this)
+        }, 600)
+    }
+
+    private fun generateBoltTree() {
+        branches.clear()
+        val w = width.toFloat()
+        val h = height.toFloat()
+
+        // Single main bolt near center
+        val startX = w * (0.35f + Random.nextFloat() * 0.3f)
+        generateTrunk(startX, h * -0.02f, h * 1.02f, w, 0)
+    }
+
+    /**
+     * Generate a trunk bolt that descends from startY to endY with guaranteed
+     * vertical coverage — each segment advances downward by a fixed Y step,
+     * only the X position zig-zags.
+     */
+    private fun generateTrunk(startX: Float, startY: Float, endY: Float, screenW: Float, depth: Int) {
+        if (depth > 2) return
+
+        val path = Path()
+        path.moveTo(startX, startY)
+
+        val totalHeight = endY - startY
+        val segmentCount = when (depth) {
+            0 -> Random.nextInt(16, 22)
+            1 -> Random.nextInt(8, 14)
+            else -> Random.nextInt(5, 9)
+        }
+        val stepY = totalHeight / segmentCount
+        val maxJitterX = screenW * when (depth) {
+            0 -> 0.08f
+            1 -> 0.06f
+            else -> 0.04f
+        }
+
+        var x = startX
+        var y = startY
+
+        for (i in 0 until segmentCount) {
+            // Guaranteed downward progress with random Y variance
+            y += stepY * (0.8f + Random.nextFloat() * 0.4f)
+
+            // Sharp zig-zag on X: alternate direction with randomness
+            val direction = if (i % 2 == 0) 1f else -1f
+            x += direction * maxJitterX * (0.5f + Random.nextFloat())
+
+            // Keep bolt on screen
+            x = x.coerceIn(screenW * 0.05f, screenW * 0.95f)
+
+            path.lineTo(x, y)
+
+            // Spawn sub-branches at sharp angles
+            if (depth < 2 && i > 0 && i < segmentCount - 1 && Random.nextFloat() < branchChance(depth)) {
+                val branchHeight = totalHeight * (0.15f + Random.nextFloat() * 0.15f)
+                val branchStartX = x + (if (Random.nextBoolean()) 1f else -1f) * maxJitterX * 2f
+                generateTrunk(x, y, y + branchHeight, screenW, depth + 1)
+            }
+        }
+
+        branches.add(BoltBranch(path, depth))
+    }
+
+    private fun branchChance(depth: Int): Float = when (depth) {
+        0 -> 0.20f
+        1 -> 0.15f
+        else -> 0f
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        if (boltAlpha <= 0f) return
+        val alpha = (boltAlpha * 255 * 0.7f).toInt()
+
+        for (branch in branches) {
+            val d = branch.depth
+
+            // Outer aura
+            outerGlowPaint.strokeWidth = when (d) { 0 -> 16f; 1 -> 10f; else -> 6f }
+            outerGlowPaint.maskFilter = BlurMaskFilter(
+                when (d) { 0 -> 24f; 1 -> 14f; else -> 8f },
+                BlurMaskFilter.Blur.NORMAL
+            )
+            outerGlowPaint.alpha = (alpha * 0.25f).toInt()
+            canvas.drawPath(branch.path, outerGlowPaint)
+
+            // Inner glow
+            innerGlowPaint.strokeWidth = when (d) { 0 -> 8f; 1 -> 5f; else -> 3f }
+            innerGlowPaint.maskFilter = BlurMaskFilter(
+                when (d) { 0 -> 8f; 1 -> 5f; else -> 3f },
+                BlurMaskFilter.Blur.NORMAL
+            )
+            innerGlowPaint.alpha = (alpha * 0.5f).toInt()
+            canvas.drawPath(branch.path, innerGlowPaint)
+
+            // Core bolt
+            corePaint.strokeWidth = when (d) { 0 -> 3.5f; 1 -> 1.8f; else -> 0.8f }
+            corePaint.alpha = alpha
+            canvas.drawPath(branch.path, corePaint)
+        }
+    }
+}
diff --git a/app/src/main/java/com/electricdreams/numo/ui/components/MintSelectionBottomSheet.kt b/app/src/main/java/com/electricdreams/numo/ui/components/MintSelectionBottomSheet.kt
index fbad8420..26e3c910 100644
--- a/app/src/main/java/com/electricdreams/numo/ui/components/MintSelectionBottomSheet.kt
+++ b/app/src/main/java/com/electricdreams/numo/ui/components/MintSelectionBottomSheet.kt
@@ -6,9 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.AccelerateDecelerateInterpolator
-import android.view.animation.OvershootInterpolator
 import android.widget.FrameLayout
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -127,12 +125,9 @@ class MintSelectionBottomSheet : BottomSheetDialogFragment() {
 
         inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
             val container: View = view.findViewById(R.id.mint_item_container)
-            val iconContainer: FrameLayout = view.findViewById(R.id.icon_container)
-            val mintIcon: ImageView = view.findViewById(R.id.mint_icon)
             val mintName: TextView = view.findViewById(R.id.mint_name)
             val mintUrl: TextView = view.findViewById(R.id.mint_url)
             val balanceText: TextView = view.findViewById(R.id.balance_text)
-            val chevron: ImageView = view.findViewById(R.id.chevron)
         }
 
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -153,11 +148,6 @@ class MintSelectionBottomSheet : BottomSheetDialogFragment() {
             val amount = Amount(balance, Amount.Currency.BTC)
             holder.balanceText.text = amount.toString()
             
-            // Icon styling
-            holder.mintIcon.setColorFilter(
-                ContextCompat.getColor(requireContext(), R.color.color_primary)
-            )
-            
             // Click handler with ripple feedback
             holder.container.setOnClickListener {
                 // Scale animation on press
@@ -189,17 +179,6 @@ class MintSelectionBottomSheet : BottomSheetDialogFragment() {
                 .setDuration(300)
                 .setInterpolator(AccelerateDecelerateInterpolator())
                 .start()
-            
-            // Icon bounce animation
-            holder.iconContainer.scaleX = 0f
-            holder.iconContainer.scaleY = 0f
-            holder.iconContainer.animate()
-                .scaleX(1f)
-                .scaleY(1f)
-                .setStartDelay((position * 60 + 100).toLong())
-                .setDuration(350)
-                .setInterpolator(OvershootInterpolator(2f))
-                .start()
         }
 
         override fun getItemCount() = mintList.size
diff --git a/app/src/main/java/com/electricdreams/numo/ui/components/WithdrawAddressCard.kt b/app/src/main/java/com/electricdreams/numo/ui/components/WithdrawAddressCard.kt
index 29e1c3cd..c3ee6e74 100644
--- a/app/src/main/java/com/electricdreams/numo/ui/components/WithdrawAddressCard.kt
+++ b/app/src/main/java/com/electricdreams/numo/ui/components/WithdrawAddressCard.kt
@@ -6,12 +6,9 @@ import android.text.TextWatcher
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.animation.AccelerateDecelerateInterpolator
-import android.view.animation.OvershootInterpolator
 import android.widget.Button
 import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.LinearLayout
+
 import android.widget.TextView
 import com.electricdreams.numo.R
 import com.google.android.material.card.MaterialCardView
@@ -39,14 +36,9 @@ class WithdrawAddressCard @JvmOverloads constructor(
 
     private var listener: OnContinueListener? = null
     
-    private val iconContainer: FrameLayout
-    private val addressIcon: ImageView
-    private val titleText: TextView
-    private val subtitleText: TextView
     private val addressInput: EditText
     private val amountInput: EditText
     private val continueButton: Button
-    private val inputContainer: LinearLayout
 
     init {
         LayoutInflater.from(context).inflate(R.layout.component_withdraw_address_card, this, true)
@@ -54,17 +46,12 @@ class WithdrawAddressCard @JvmOverloads constructor(
         // Setup card styling
         radius = resources.getDimension(R.dimen.card_corner_radius)
         cardElevation = 0f
-        setCardBackgroundColor(context.getColor(R.color.color_bg_card))
+        setCardBackgroundColor(android.graphics.Color.TRANSPARENT)
         
         // Find views
-        iconContainer = findViewById(R.id.icon_container)
-        addressIcon = findViewById(R.id.address_icon)
-        titleText = findViewById(R.id.title_text)
-        subtitleText = findViewById(R.id.subtitle_text)
         addressInput = findViewById(R.id.address_input)
         amountInput = findViewById(R.id.amount_input)
         continueButton = findViewById(R.id.continue_button)
-        inputContainer = findViewById(R.id.input_container)
         
         setupListeners()
     }
@@ -117,10 +104,8 @@ class WithdrawAddressCard @JvmOverloads constructor(
     private fun updateButtonState() {
         val hasAddress = !addressInput.text.isNullOrBlank()
         val hasValidAmount = amountInput.text.toString().toLongOrNull()?.let { it > 0 } ?: false
-        val enabled = hasAddress && hasValidAmount
-        
-        continueButton.isEnabled = enabled
-        continueButton.alpha = if (enabled) 1f else 0.5f
+
+        continueButton.isEnabled = hasAddress && hasValidAmount
     }
 
     /**
@@ -191,16 +176,5 @@ class WithdrawAddressCard @JvmOverloads constructor(
             .setDuration(350)
             .setInterpolator(AccelerateDecelerateInterpolator())
             .start()
-        
-        // Icon bounce
-        iconContainer.scaleX = 0f
-        iconContainer.scaleY = 0f
-        iconContainer.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .setStartDelay(delay + 150)
-            .setDuration(400)
-            .setInterpolator(OvershootInterpolator(2f))
-            .start()
     }
 }
diff --git a/app/src/main/java/com/electricdreams/numo/ui/components/WithdrawInvoiceCard.kt b/app/src/main/java/com/electricdreams/numo/ui/components/WithdrawInvoiceCard.kt
index d1b78c9d..423b3b1c 100644
--- a/app/src/main/java/com/electricdreams/numo/ui/components/WithdrawInvoiceCard.kt
+++ b/app/src/main/java/com/electricdreams/numo/ui/components/WithdrawInvoiceCard.kt
@@ -6,12 +6,9 @@ import android.text.TextWatcher
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.animation.AccelerateDecelerateInterpolator
-import android.view.animation.OvershootInterpolator
 import android.widget.Button
 import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.LinearLayout
+
 import android.widget.TextView
 import com.electricdreams.numo.R
 import com.google.android.material.card.MaterialCardView
@@ -43,14 +40,9 @@ class WithdrawInvoiceCard @JvmOverloads constructor(
     private var listener: OnContinueListener? = null
     private var scanListener: OnScanListener? = null
     
-    private val iconContainer: FrameLayout
-    private val invoiceIcon: ImageView
-    private val titleText: TextView
-    private val subtitleText: TextView
     private val invoiceInput: EditText
     private val continueButton: Button
-    private val scanButton: android.widget.ImageButton
-    private val inputContainer: LinearLayout
+    private val scanButton: Button
 
     init {
         LayoutInflater.from(context).inflate(R.layout.component_withdraw_invoice_card, this, true)
@@ -58,17 +50,12 @@ class WithdrawInvoiceCard @JvmOverloads constructor(
         // Setup card styling
         radius = resources.getDimension(R.dimen.card_corner_radius)
         cardElevation = 0f
-        setCardBackgroundColor(context.getColor(R.color.color_bg_card))
+        setCardBackgroundColor(android.graphics.Color.TRANSPARENT)
         
         // Find views
-        iconContainer = findViewById(R.id.icon_container)
-        invoiceIcon = findViewById(R.id.invoice_icon)
-        titleText = findViewById(R.id.title_text)
-        subtitleText = findViewById(R.id.subtitle_text)
         invoiceInput = findViewById(R.id.invoice_input)
         continueButton = findViewById(R.id.continue_button)
         scanButton = findViewById(R.id.scan_button)
-        inputContainer = findViewById(R.id.input_container)
         
         setupListeners()
     }
@@ -115,7 +102,6 @@ class WithdrawInvoiceCard @JvmOverloads constructor(
     
     private fun updateButtonState(enabled: Boolean) {
         continueButton.isEnabled = enabled
-        continueButton.alpha = if (enabled) 1f else 0.5f
     }
 
     /**
@@ -174,16 +160,5 @@ class WithdrawInvoiceCard @JvmOverloads constructor(
             .setDuration(350)
             .setInterpolator(AccelerateDecelerateInterpolator())
             .start()
-        
-        // Icon bounce
-        iconContainer.scaleX = 0f
-        iconContainer.scaleY = 0f
-        iconContainer.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .setStartDelay(delay + 150)
-            .setDuration(400)
-            .setInterpolator(OvershootInterpolator(2f))
-            .start()
     }
 }
diff --git a/app/src/main/res/color/button_text_onboarding.xml b/app/src/main/res/color/button_text_onboarding.xml
new file mode 100644
index 00000000..f51b0e77
--- /dev/null
+++ b/app/src/main/res/color/button_text_onboarding.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="#4DFFFFFF" />
+    <item android:color="#0A2540" />
+</selector>
diff --git a/app/src/main/res/color/color_button_primary_green_text.xml b/app/src/main/res/color/color_button_primary_green_text.xml
new file mode 100644
index 00000000..607cb2c6
--- /dev/null
+++ b/app/src/main/res/color/color_button_primary_green_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false" android:color="@color/color_text_tertiary" />
+    <item android:color="@color/color_button_primary_text" />
+</selector>
diff --git a/app/src/main/res/color/selector_switch_thumb.xml b/app/src/main/res/color/selector_switch_thumb.xml
new file mode 100644
index 00000000..364c5827
--- /dev/null
+++ b/app/src/main/res/color/selector_switch_thumb.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="@android:color/white" />
+    <item android:color="@android:color/white" />
+</selector>
diff --git a/app/src/main/res/color/selector_switch_track.xml b/app/src/main/res/color/selector_switch_track.xml
new file mode 100644
index 00000000..bb838d8c
--- /dev/null
+++ b/app/src/main/res/color/selector_switch_track.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="@color/color_success_green" />
+    <item android:color="#E0E0E0" />
+</selector>
diff --git a/app/src/main/res/drawable-night/bg_hero_bolt_fade.xml b/app/src/main/res/drawable-night/bg_hero_bolt_fade.xml
new file mode 100644
index 00000000..b6e3819b
--- /dev/null
+++ b/app/src/main/res/drawable-night/bg_hero_bolt_fade.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#001A1F23"
+        android:endColor="#FF1A1F23"
+        android:angle="270" />
+</shape>
diff --git a/app/src/main/res/drawable-night/bg_hero_bolt_fade_active.xml b/app/src/main/res/drawable-night/bg_hero_bolt_fade_active.xml
new file mode 100644
index 00000000..b6e3819b
--- /dev/null
+++ b/app/src/main/res/drawable-night/bg_hero_bolt_fade_active.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#001A1F23"
+        android:endColor="#FF1A1F23"
+        android:angle="270" />
+</shape>
diff --git a/app/src/main/res/drawable-night/bg_hero_bolt_fade_green.xml b/app/src/main/res/drawable-night/bg_hero_bolt_fade_green.xml
new file mode 100644
index 00000000..b6e3819b
--- /dev/null
+++ b/app/src/main/res/drawable-night/bg_hero_bolt_fade_green.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#001A1F23"
+        android:endColor="#FF1A1F23"
+        android:angle="270" />
+</shape>
diff --git a/app/src/main/res/drawable-night/bg_hero_gradient.xml b/app/src/main/res/drawable-night/bg_hero_gradient.xml
new file mode 100644
index 00000000..17829323
--- /dev/null
+++ b/app/src/main/res/drawable-night/bg_hero_gradient.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#1A1F23"
+        android:endColor="#1C1B18"
+        android:angle="135" />
+    <corners android:radius="24dp" />
+</shape>
diff --git a/app/src/main/res/drawable-night/bg_hero_gradient_active.xml b/app/src/main/res/drawable-night/bg_hero_gradient_active.xml
new file mode 100644
index 00000000..a2d5a6ac
--- /dev/null
+++ b/app/src/main/res/drawable-night/bg_hero_gradient_active.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#1A1F23"
+        android:endColor="#181C18"
+        android:angle="135" />
+    <corners android:radius="24dp" />
+</shape>
diff --git a/app/src/main/res/drawable-night/bg_hero_gradient_green.xml b/app/src/main/res/drawable-night/bg_hero_gradient_green.xml
new file mode 100644
index 00000000..1a011087
--- /dev/null
+++ b/app/src/main/res/drawable-night/bg_hero_gradient_green.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#1A1F23"
+        android:endColor="#181E1A"
+        android:angle="135" />
+    <corners android:radius="20dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_bottom_sheet_dark.xml b/app/src/main/res/drawable/bg_bottom_sheet_dark.xml
new file mode 100644
index 00000000..9bb48ca9
--- /dev/null
+++ b/app/src/main/res/drawable/bg_bottom_sheet_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/numo_navy"/>
+    <corners android:topLeftRadius="20dp" android:topRightRadius="20dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/bg_button_green.xml b/app/src/main/res/drawable/bg_button_green.xml
new file mode 100644
index 00000000..5766840c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_button_green.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#400A2540">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/numo_fluorescent_green" />
+            <corners android:radius="28dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/bg_button_outlined_dark.xml b/app/src/main/res/drawable/bg_button_outlined_dark.xml
new file mode 100644
index 00000000..8f01a432
--- /dev/null
+++ b/app/src/main/res/drawable/bg_button_outlined_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#1AFFFFFF">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent" />
+            <stroke android:width="1dp" android:color="#26FFFFFF" />
+            <corners android:radius="22dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/bg_button_primary_green.xml b/app/src/main/res/drawable/bg_button_primary_green.xml
index f81f319e..1815759f 100644
--- a/app/src/main/res/drawable/bg_button_primary_green.xml
+++ b/app/src/main/res/drawable/bg_button_primary_green.xml
@@ -3,21 +3,21 @@
     <!-- Disabled state -->
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="100dp" />
             <solid android:color="@color/color_button_primary_disabled" />
         </shape>
     </item>
     <!-- Pressed state -->
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="100dp" />
             <solid android:color="@color/color_button_primary_pressed" />
         </shape>
     </item>
     <!-- Enabled state -->
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="100dp" />
             <solid android:color="@color/color_primary_green" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_button_secondary_outlined.xml b/app/src/main/res/drawable/bg_button_secondary_outlined.xml
index 67736b26..a6aa6711 100644
--- a/app/src/main/res/drawable/bg_button_secondary_outlined.xml
+++ b/app/src/main/res/drawable/bg_button_secondary_outlined.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="26dp" />
-    <solid android:color="@color/color_bg_white" />
-    <stroke android:width="1dp" android:color="@color/color_chip_border" />
+    <corners android:radius="12dp" />
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="1dp" android:color="@color/color_divider"
+        android:dashWidth="6dp" android:dashGap="4dp" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_button_white.xml b/app/src/main/res/drawable/bg_button_white.xml
index 27fd7562..a2f7aec6 100644
--- a/app/src/main/res/drawable/bg_button_white.xml
+++ b/app/src/main/res/drawable/bg_button_white.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Disabled state - black with 20% opacity -->
+    <!-- Disabled state — subtle on dark bg -->
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
-            <solid android:color="#33000000" />
+            <corners android:radius="28dp" />
+            <solid android:color="#1AFFFFFF" />
         </shape>
     </item>
-    <!-- Pressed state - 75% opacity white -->
+    <!-- Pressed state -->
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
-            <solid android:color="#BFFFFFFF" />
+            <corners android:radius="28dp" />
+            <solid android:color="#CCFFFFFF" />
         </shape>
     </item>
-    <!-- Enabled state - 100% white -->
+    <!-- Enabled state -->
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="28dp" />
             <solid android:color="#FFFFFF" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_checkbox_checked.xml b/app/src/main/res/drawable/bg_checkbox_checked.xml
new file mode 100644
index 00000000..4750b2be
--- /dev/null
+++ b/app/src/main/res/drawable/bg_checkbox_checked.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <size android:width="22dp" android:height="22dp" />
+            <corners android:radius="6dp" />
+            <solid android:color="@color/color_text_primary" />
+        </shape>
+    </item>
+    <item
+        android:gravity="center"
+        android:width="14dp"
+        android:height="14dp"
+        android:drawable="@drawable/ic_checkmark_dark" />
+</layer-list>
diff --git a/app/src/main/res/drawable/bg_checkbox_unchecked.xml b/app/src/main/res/drawable/bg_checkbox_unchecked.xml
new file mode 100644
index 00000000..c788abd6
--- /dev/null
+++ b/app/src/main/res/drawable/bg_checkbox_unchecked.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <size android:width="22dp" android:height="22dp" />
+    <corners android:radius="6dp" />
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="2dp" android:color="@color/color_divider" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_checkout_button.xml b/app/src/main/res/drawable/bg_checkout_button.xml
index 302bab99..10336ec5 100644
--- a/app/src/main/res/drawable/bg_checkout_button.xml
+++ b/app/src/main/res/drawable/bg_checkout_button.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/color_success_green" />
-            <corners android:radius="16dp" />
+            <corners android:radius="100dp" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/bg_circle_reveal.xml b/app/src/main/res/drawable/bg_circle_reveal.xml
new file mode 100644
index 00000000..50a2eac8
--- /dev/null
+++ b/app/src/main/res/drawable/bg_circle_reveal.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/numo_fluorescent_green" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_default_mint_item.xml b/app/src/main/res/drawable/bg_default_mint_item.xml
new file mode 100644
index 00000000..463ec302
--- /dev/null
+++ b/app/src/main/res/drawable/bg_default_mint_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/color_divider">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#FFFFFF" />
+            <stroke android:width="1.5dp" android:color="@color/color_divider" />
+            <corners android:radius="12dp" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/bg_default_pill.xml b/app/src/main/res/drawable/bg_default_pill.xml
new file mode 100644
index 00000000..9df0454e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_default_pill.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#1A5EFFC2" />
+    <corners android:radius="100dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_empty_state_action_button.xml b/app/src/main/res/drawable/bg_empty_state_action_button.xml
new file mode 100644
index 00000000..92112951
--- /dev/null
+++ b/app/src/main/res/drawable/bg_empty_state_action_button.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <corners android:radius="100dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/color_divider"
+        android:dashWidth="6dp"
+        android:dashGap="4dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_empty_state_icon.xml b/app/src/main/res/drawable/bg_empty_state_icon.xml
new file mode 100644
index 00000000..c2d35972
--- /dev/null
+++ b/app/src/main/res/drawable/bg_empty_state_icon.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="@color/color_bg_surface" />
+    <corners android:radius="16dp" />
+    <size android:width="56dp" android:height="56dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_hero_bolt_fade.xml b/app/src/main/res/drawable/bg_hero_bolt_fade.xml
new file mode 100644
index 00000000..2f9105ea
--- /dev/null
+++ b/app/src/main/res/drawable/bg_hero_bolt_fade.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#00FFFFFF"
+        android:endColor="#FFFFFF"
+        android:angle="270" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_hero_bolt_fade_active.xml b/app/src/main/res/drawable/bg_hero_bolt_fade_active.xml
new file mode 100644
index 00000000..2f9105ea
--- /dev/null
+++ b/app/src/main/res/drawable/bg_hero_bolt_fade_active.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#00FFFFFF"
+        android:endColor="#FFFFFF"
+        android:angle="270" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_hero_bolt_fade_green.xml b/app/src/main/res/drawable/bg_hero_bolt_fade_green.xml
new file mode 100644
index 00000000..133140be
--- /dev/null
+++ b/app/src/main/res/drawable/bg_hero_bolt_fade_green.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_hero_gradient.xml b/app/src/main/res/drawable/bg_hero_gradient.xml
index a6d5fb70..4a3326fa 100644
--- a/app/src/main/res/drawable/bg_hero_gradient.xml
+++ b/app/src/main/res/drawable/bg_hero_gradient.xml
@@ -3,8 +3,8 @@
     android:shape="rectangle">
     <gradient
         android:type="linear"
-        android:startColor="#1A1A2E"
-        android:endColor="#0F0F23"
+        android:startColor="#FFFFFF"
+        android:endColor="#FFFCF9"
         android:angle="135" />
     <corners android:radius="24dp" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_hero_gradient_active.xml b/app/src/main/res/drawable/bg_hero_gradient_active.xml
new file mode 100644
index 00000000..7938fc53
--- /dev/null
+++ b/app/src/main/res/drawable/bg_hero_gradient_active.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#FFFFFF"
+        android:endColor="#F9FCFA"
+        android:angle="135" />
+    <corners android:radius="24dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_hero_gradient_dark.xml b/app/src/main/res/drawable/bg_hero_gradient_dark.xml
new file mode 100644
index 00000000..f5ef93c2
--- /dev/null
+++ b/app/src/main/res/drawable/bg_hero_gradient_dark.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#122E48"
+        android:endColor="#0A2540"
+        android:angle="135" />
+    <stroke
+        android:width="1dp"
+        android:color="#1A5EFFC2" />
+    <corners android:radius="20dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_hero_gradient_green.xml b/app/src/main/res/drawable/bg_hero_gradient_green.xml
new file mode 100644
index 00000000..5d0b5af1
--- /dev/null
+++ b/app/src/main/res/drawable/bg_hero_gradient_green.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:startColor="#FFFFFF"
+        android:endColor="#F2FBF5"
+        android:angle="135" />
+    <corners android:radius="20dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_input_dark.xml b/app/src/main/res/drawable/bg_input_dark.xml
new file mode 100644
index 00000000..6c0c0f2e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_input_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#14FFFFFF" />
+    <stroke android:width="1dp" android:color="#1FFFFFFF" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_mint_add_button.xml b/app/src/main/res/drawable/bg_mint_add_button.xml
new file mode 100644
index 00000000..e81f4de3
--- /dev/null
+++ b/app/src/main/res/drawable/bg_mint_add_button.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="12dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#26FFFFFF"
+        android:dashWidth="4dp"
+        android:dashGap="3dp" />
+    <solid android:color="@android:color/transparent" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_mint_item.xml b/app/src/main/res/drawable/bg_mint_item.xml
index ded70544..b736c0e1 100644
--- a/app/src/main/res/drawable/bg_mint_item.xml
+++ b/app/src/main/res/drawable/bg_mint_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/color_divider">
+    android:color="#1AFFFFFF">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/color_bg_light" />
+            <solid android:color="@color/numo_navy" />
             <corners android:radius="12dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_nav_back_button.xml b/app/src/main/res/drawable/bg_nav_back_button.xml
new file mode 100644
index 00000000..2e45ef66
--- /dev/null
+++ b/app/src/main/res/drawable/bg_nav_back_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/color_ripple">
+    <item android:id="@android:id/mask">
+        <shape android:shape="oval">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/bg_placeholder_image.xml b/app/src/main/res/drawable/bg_placeholder_image.xml
new file mode 100644
index 00000000..3d7a3854
--- /dev/null
+++ b/app/src/main/res/drawable/bg_placeholder_image.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#0A5EFFC2" />
+    <stroke android:width="1dp" android:color="#125EFFC2" />
+    <corners android:radius="14dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_placeholder_image_large.xml b/app/src/main/res/drawable/bg_placeholder_image_large.xml
new file mode 100644
index 00000000..3fc1c776
--- /dev/null
+++ b/app/src/main/res/drawable/bg_placeholder_image_large.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#0A5EFFC2" />
+    <stroke android:width="1dp" android:color="#125EFFC2" />
+    <corners android:radius="20dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_radio_checked.xml b/app/src/main/res/drawable/bg_radio_checked.xml
new file mode 100644
index 00000000..3143cfa4
--- /dev/null
+++ b/app/src/main/res/drawable/bg_radio_checked.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Outer circle -->
+    <item>
+        <shape android:shape="oval">
+            <size android:width="22dp" android:height="22dp" />
+            <solid android:color="@color/color_text_primary" />
+        </shape>
+    </item>
+    <!-- Inner dot -->
+    <item
+        android:gravity="center"
+        android:width="10dp"
+        android:height="10dp">
+        <shape android:shape="oval">
+            <solid android:color="@color/color_bg_white" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable/bg_radio_unchecked.xml b/app/src/main/res/drawable/bg_radio_unchecked.xml
new file mode 100644
index 00000000..d4d55463
--- /dev/null
+++ b/app/src/main/res/drawable/bg_radio_unchecked.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <size android:width="22dp" android:height="22dp" />
+    <solid android:color="@android:color/transparent" />
+    <stroke android:width="2dp" android:color="@color/color_divider" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_row_ripple.xml b/app/src/main/res/drawable/bg_row_ripple.xml
new file mode 100644
index 00000000..c2dc7e0f
--- /dev/null
+++ b/app/src/main/res/drawable/bg_row_ripple.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/color_ripple">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <corners android:radius="12dp" />
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+</ripple>
diff --git a/app/src/main/res/drawable/bg_save_button.xml b/app/src/main/res/drawable/bg_save_button.xml
index 90d6c168..21d94c1f 100644
--- a/app/src/main/res/drawable/bg_save_button.xml
+++ b/app/src/main/res/drawable/bg_save_button.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/color_accent_blue" />
-            <corners android:radius="16dp" />
+            <corners android:radius="100dp" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/bg_seed_input_dark.xml b/app/src/main/res/drawable/bg_seed_input_dark.xml
new file mode 100644
index 00000000..2224adb9
--- /dev/null
+++ b/app/src/main/res/drawable/bg_seed_input_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#14FFFFFF" />
+    <stroke android:width="1.5dp" android:color="#1FFFFFFF" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_seed_input_dark_focused.xml b/app/src/main/res/drawable/bg_seed_input_dark_focused.xml
new file mode 100644
index 00000000..32280717
--- /dev/null
+++ b/app/src/main/res/drawable/bg_seed_input_dark_focused.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#14FFFFFF" />
+    <stroke android:width="2dp" android:color="@color/numo_fluorescent_green" />
+    <corners android:radius="12dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_teaser_card.xml b/app/src/main/res/drawable/bg_teaser_card.xml
new file mode 100644
index 00000000..3457e039
--- /dev/null
+++ b/app/src/main/res/drawable/bg_teaser_card.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/numo_fluorescent_green" />
+    <corners android:radius="20dp" />
+</shape>
diff --git a/app/src/main/res/drawable/bg_teaser_gradient.xml b/app/src/main/res/drawable/bg_teaser_gradient.xml
new file mode 100644
index 00000000..ae44ac87
--- /dev/null
+++ b/app/src/main/res/drawable/bg_teaser_gradient.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:startColor="#000A2540"
+        android:endColor="#0A2540"
+        android:angle="270" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_autoplay.xml b/app/src/main/res/drawable/ic_autoplay.xml
new file mode 100644
index 00000000..fac1568e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_autoplay.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8C6.25,13.97 6,13.01 6,12c0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2C17.74,10.04 18,10.99 18,12c0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_autorenew.xml b/app/src/main/res/drawable/ic_autorenew.xml
new file mode 100644
index 00000000..fac1568e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_autorenew.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8C6.25,13.97 6,13.01 6,12c0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2C17.74,10.04 18,10.99 18,12c0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_checkmark_dark.xml b/app/src/main/res/drawable/ic_checkmark_dark.xml
new file mode 100644
index 00000000..4522f9a1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_checkmark_dark.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M5,13l4,4L19,7"
+        android:strokeColor="@color/color_bg_white"
+        android:strokeWidth="2.5"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        android:fillColor="@android:color/transparent" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_chevron_down_hint.xml b/app/src/main/res/drawable/ic_chevron_down_hint.xml
new file mode 100644
index 00000000..b7ae66f3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chevron_down_hint.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="14dp"
+    android:viewportWidth="24"
+    android:viewportHeight="14">
+    <path
+        android:pathData="M4,4L12,11L20,4"
+        android:strokeWidth="2"
+        android:strokeColor="@color/numo_fluorescent_green"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_clock_stroke.xml b/app/src/main/res/drawable/ic_clock_stroke.xml
new file mode 100644
index 00000000..c44d2d8b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clock_stroke.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <!-- Circular arrow (partial circle with arrow) -->
+    <path
+        android:pathData="M4,11a7,7 0,1 1,1.4 4.2"
+        android:strokeWidth="1.8"
+        android:strokeColor="#80FFFFFF"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <!-- Arrow head -->
+    <path
+        android:pathData="M3.2,8L4,11L7,11"
+        android:strokeWidth="1.8"
+        android:strokeColor="#80FFFFFF"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <!-- Clock hands -->
+    <path
+        android:pathData="M11,7L11,11L13.5,12.5"
+        android:strokeWidth="1.8"
+        android:strokeColor="#80FFFFFF"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_home_filled.xml b/app/src/main/res/drawable/ic_home_filled.xml
new file mode 100644
index 00000000..cbaefeae
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_filled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#F59E0B"
+        android:pathData="M12,2l3.09,6.26L22,9.27l-5,4.87L18.18,21 12,17.77 5.82,21 7,14.14l-5,-4.87 6.91,-1.01z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_home_outline.xml b/app/src/main/res/drawable/ic_home_outline.xml
new file mode 100644
index 00000000..f857b952
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_outline.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/color_text_tertiary"
+        android:pathData="M12,2l3.09,6.26L22,9.27l-5,4.87L18.18,21 12,17.77 5.82,21 7,14.14l-5,-4.87 6.91,-1.01zM12,5.4l-2.12,4.3 -4.74,0.69 3.43,3.34 -0.81,4.72L12,16.08l4.24,2.37 -0.81,-4.72 3.43,-3.34 -4.74,-0.69z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_plus_small.xml b/app/src/main/res/drawable/ic_plus_small.xml
new file mode 100644
index 00000000..b7f82f3d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_plus_small.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="14dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12,4.5v15m7.5,-7.5h-15"
+        android:strokeColor="@color/color_text_secondary"
+        android:strokeWidth="2"
+        android:strokeLineCap="round"
+        android:fillColor="@android:color/transparent" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_plus_stroke.xml b/app/src/main/res/drawable/ic_plus_stroke.xml
new file mode 100644
index 00000000..9049895c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_plus_stroke.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+    <path
+        android:pathData="M11,5L11,17"
+        android:strokeWidth="1.8"
+        android:strokeColor="#80FFFFFF"
+        android:strokeLineCap="round" />
+    <path
+        android:pathData="M5,11L17,11"
+        android:strokeWidth="1.8"
+        android:strokeColor="#80FFFFFF"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_success_checkmark.xml b/app/src/main/res/drawable/ic_success_checkmark.xml
index b3e087b6..a4d2b652 100644
--- a/app/src/main/res/drawable/ic_success_checkmark.xml
+++ b/app/src/main/res/drawable/ic_success_checkmark.xml
@@ -4,15 +4,11 @@
     android:height="88dp"
     android:viewportWidth="88"
     android:viewportHeight="88">
-    <!-- Circle background -->
+    <!-- Mint green circle -->
     <path
-        android:fillColor="#E8F5E9"
-        android:pathData="M44,44m-44,0a44,44 0,1 1,88 0a44,44 0,1 1,-88 0"/>
-    <!-- Inner circle -->
-    <path
-        android:fillColor="#00C244"
-        android:pathData="M44,44m-32,0a32,32 0,1 1,64 0a32,32 0,1 1,-64 0"/>
-    <!-- Checkmark -->
+        android:fillColor="#5EFFC2"
+        android:pathData="M44,44m-40,0a40,40 0,1 1,80 0a40,40 0,1 1,-80 0"/>
+    <!-- White checkmark -->
     <path
         android:fillColor="#FFFFFF"
         android:pathData="M38.5,55.5L28,45l3.5,-3.5 7,7 15,-15 3.5,3.5z"/>
diff --git a/app/src/main/res/drawable/img_minibits_nfc.png b/app/src/main/res/drawable/img_minibits_nfc.png
new file mode 100644
index 00000000..03457329
Binary files /dev/null and b/app/src/main/res/drawable/img_minibits_nfc.png differ
diff --git a/app/src/main/res/drawable/img_numo_invoice.png b/app/src/main/res/drawable/img_numo_invoice.png
new file mode 100644
index 00000000..a99c5440
Binary files /dev/null and b/app/src/main/res/drawable/img_numo_invoice.png differ
diff --git a/app/src/main/res/drawable/img_tap_to_pay.jpg b/app/src/main/res/drawable/img_tap_to_pay.jpg
new file mode 100644
index 00000000..36690335
Binary files /dev/null and b/app/src/main/res/drawable/img_tap_to_pay.jpg differ
diff --git a/app/src/main/res/drawable/selector_checkbox_custom.xml b/app/src/main/res/drawable/selector_checkbox_custom.xml
new file mode 100644
index 00000000..413db473
--- /dev/null
+++ b/app/src/main/res/drawable/selector_checkbox_custom.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:drawable="@drawable/bg_checkbox_checked" />
+    <item android:drawable="@drawable/bg_checkbox_unchecked" />
+</selector>
diff --git a/app/src/main/res/drawable/selector_radio_custom.xml b/app/src/main/res/drawable/selector_radio_custom.xml
new file mode 100644
index 00000000..e19feaba
--- /dev/null
+++ b/app/src/main/res/drawable/selector_radio_custom.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:drawable="@drawable/bg_radio_checked" />
+    <item android:drawable="@drawable/bg_radio_unchecked" />
+</selector>
diff --git a/app/src/main/res/layout/activity_auto_withdraw_settings.xml b/app/src/main/res/layout/activity_auto_withdraw_settings.xml
index 8093be3f..29e2da11 100644
--- a/app/src/main/res/layout/activity_auto_withdraw_settings.xml
+++ b/app/src/main/res/layout/activity_auto_withdraw_settings.xml
@@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_bg_white">
@@ -14,15 +15,15 @@
         android:orientation="horizontal"
         android:gravity="center_vertical"
         android:paddingHorizontal="8dp"
-        android:elevation="1dp"
         android:background="@color/color_bg_white"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:src="@drawable/ic_chevron_back"
             android:contentDescription="@string/common_back"
             app:tint="@color/color_text_primary" />
@@ -32,9 +33,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/auto_withdraw_settings_title"
-            android:textSize="20sp"
-            android:textColor="@color/color_text_primary"
-            android:fontFamily="sans-serif-medium"
+            android:textAppearance="@style/Text.Title"
             android:textAlignment="center" />
 
         <!-- Spacer to balance layout -->
@@ -48,7 +47,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:fillViewport="true"
-        android:background="@color/color_bg_surface"
         app:layout_constraintTop_toBottomOf="@id/top_bar"
         app:layout_constraintBottom_toBottomOf="parent">
 
@@ -73,102 +71,111 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:cardBackgroundColor="@android:color/transparent"
-                    app:cardCornerRadius="24dp"
+                    app:cardCornerRadius="16dp"
                     app:cardElevation="0dp">
 
-                    <androidx.constraintlayout.widget.ConstraintLayout
+                    <FrameLayout
+                        android:id="@+id/hero_bg"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/bg_hero_gradient"
-                        android:padding="24dp">
+                        android:background="@drawable/bg_hero_gradient_green"
+                        android:clipChildren="false">
 
-                        <!-- Animated Icon Container -->
+                        <!-- Decorative background lightning bolt with fade -->
                         <FrameLayout
-                            android:id="@+id/icon_container"
-                            android:layout_width="80dp"
-                            android:layout_height="80dp"
-                            android:background="@drawable/bg_circle"
-                            android:backgroundTint="#2A2A4A"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent">
+                            android:layout_width="140dp"
+                            android:layout_height="140dp"
+                            android:layout_gravity="bottom|end"
+                            android:layout_marginEnd="-30dp"
+                            android:layout_marginBottom="-30dp">
 
                             <ImageView
-                                android:id="@+id/hero_icon"
-                                android:layout_width="48dp"
-                                android:layout_height="48dp"
-                                android:layout_gravity="center"
+                                android:id="@+id/hero_bolt"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:alpha="0.06"
+                                android:rotation="-15"
+                                android:importantForAccessibility="no"
                                 android:src="@drawable/ic_lightning_bolt"
-                                app:tint="#FFFFFF" />
+                                app:tint="@color/color_success_green" />
+
+                            <View
+                                android:id="@+id/hero_bolt_fade"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/bg_hero_bolt_fade_green" />
 
                         </FrameLayout>
 
-                        <!-- Title -->
-                        <TextView
-                            android:id="@+id/hero_title"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="20dp"
-                            android:fontFamily="sans-serif-medium"
-                            android:text="@string/auto_withdraw_hero_title"
-                            android:textColor="#FFFFFF"
-                            android:textSize="22sp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@id/icon_container" />
-
-                        <!-- Subtitle -->
-                        <TextView
-                            android:id="@+id/hero_subtitle"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:alpha="0.7"
-                            android:fontFamily="sans-serif"
-                            android:gravity="center"
-                            android:paddingHorizontal="16dp"
-                            android:text="@string/auto_withdraw_hero_subtitle"
-                            android:textColor="#FFFFFF"
-                            android:textSize="15sp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@id/hero_title" />
-
-                        <!-- Status Indicator -->
-                        <LinearLayout
-                            android:id="@+id/status_container"
-                            android:layout_width="wrap_content"
+                        <!-- Content -->
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="20dp"
-                            android:background="@drawable/bg_status_pill_success"
-                            android:gravity="center"
-                            android:orientation="horizontal"
-                            android:paddingHorizontal="16dp"
-                            android:paddingVertical="8dp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@id/hero_subtitle">
+                            android:padding="24dp">
 
-                            <View
-                                android:id="@+id/status_dot"
-                                android:layout_width="8dp"
-                                android:layout_height="8dp"
-                                android:layout_marginEnd="8dp"
-                                android:background="@drawable/bg_notification_dot"
-                                android:backgroundTint="@color/color_success_green" />
-
-                            <TextView
-                                android:id="@+id/status_text"
+                            <!-- Status badge (top-left) -->
+                            <LinearLayout
+                                android:id="@+id/status_container"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:fontFamily="sans-serif-medium"
-                                android:text="@string/auto_withdraw_status_inactive"
-                                android:textColor="@color/color_success_green"
-                                android:textSize="13sp" />
+                                android:background="@drawable/bg_status_pill_success"
+                                android:gravity="center"
+                                android:orientation="horizontal"
+                                android:paddingHorizontal="10dp"
+                                android:paddingVertical="4dp"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintStart_toStartOf="parent">
+                                <View
+                                    android:id="@+id/status_dot"
+                                    android:layout_width="8dp"
+                                    android:layout_height="8dp"
+                                    android:layout_marginEnd="6dp"
+                                    android:background="@drawable/bg_notification_dot"
+                                    android:backgroundTint="@color/color_success_green" />
+                                <TextView
+                                    android:id="@+id/status_text"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:fontFamily="sans-serif-medium"
+                                    android:text="@string/auto_withdraw_status_inactive"
+                                    android:textColor="@color/color_success_green"
+                                    android:textSize="11sp" />
+                            </LinearLayout>
+
+                            <!-- Title Row -->
+                            <LinearLayout
+                                android:id="@+id/hero_content_row"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="12dp"
+                                android:orientation="vertical"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toBottomOf="@id/status_container">
 
-                        </LinearLayout>
+                                <TextView
+                                    android:id="@+id/hero_title"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:fontFamily="sans-serif-medium"
+                                    android:text="@string/auto_withdraw_hero_title"
+                                    android:textColor="@color/color_text_primary"
+                                    android:textSize="17sp"
+                                    android:letterSpacing="-0.012" />
+                                <TextView
+                                    android:id="@+id/hero_subtitle"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="2dp"
+                                    android:fontFamily="sans-serif"
+                                    android:text="@string/auto_withdraw_hero_subtitle"
+                                    android:textColor="@color/color_text_secondary"
+                                    android:textSize="13sp" />
+
+                            </LinearLayout>
 
-                    </androidx.constraintlayout.widget.ConstraintLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+                    </FrameLayout>
                 </androidx.cardview.widget.CardView>
 
             </LinearLayout>
@@ -177,102 +184,87 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingHorizontal="20dp">
+                android:orientation="vertical">
 
                 <!-- ==================== -->
-                <!-- MAIN TOGGLE CARD -->
+                <!-- MAIN TOGGLE ROW -->
                 <!-- ==================== -->
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/toggle_card"
+                <LinearLayout
+                    android:id="@+id/enable_toggle_row"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    app:cardBackgroundColor="@color/color_bg_card"
-                    app:cardCornerRadius="16dp"
-                    app:cardElevation="0dp">
+                    android:background="@drawable/bg_row_ripple"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingVertical="14dp"
+                    android:paddingHorizontal="20dp">
+
+                    <ImageView
+                        android:id="@+id/toggle_icon"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginEnd="14dp"
+                        android:src="@drawable/ic_autoplay"
+                        app:tint="@color/color_icon_secondary" />
 
                     <LinearLayout
-                        android:id="@+id/enable_toggle_row"
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackground"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:padding="20dp">
-
-                        <!-- Icon -->
-                        <FrameLayout
-                            android:layout_width="44dp"
-                            android:layout_height="44dp"
-                            android:layout_marginEnd="16dp"
-                            android:background="@drawable/bg_circle"
-                            android:backgroundTint="#E8F5E9">
-
-                            <ImageView
-                                android:layout_width="22dp"
-                                android:layout_height="22dp"
-                                android:layout_gravity="center"
-                                android:src="@drawable/ic_lightning_bolt"
-                                app:tint="@color/color_success_green" />
-                        </FrameLayout>
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
-                        <!-- Text -->
-                        <LinearLayout
-                            android:layout_width="0dp"
+                        <TextView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
+                            android:text="@string/auto_withdraw_enable_title"
+                            android:textAppearance="@style/Text.RowTitle" />
 
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:fontFamily="sans-serif-medium"
-                                android:text="@string/auto_withdraw_enable_title"
-                                android:textColor="@color/color_text_primary"
-                                android:textSize="17sp" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="4dp"
-                                android:text="@string/auto_withdraw_enable_subtitle"
-                                android:textColor="@color/color_text_secondary"
-                                android:textSize="14sp" />
-
-                        </LinearLayout>
-
-                        <!-- iOS-style Toggle -->
-                        <androidx.appcompat.widget.SwitchCompat
-                            android:id="@+id/enable_switch"
+                        <TextView
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:text="@string/auto_withdraw_enable_subtitle"
+                            android:textAppearance="@style/Text.RowSubtitle" />
 
                     </LinearLayout>
 
-                </androidx.cardview.widget.CardView>
+                    <androidx.appcompat.widget.SwitchCompat
+                        android:id="@+id/enable_switch"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:thumbTint="@color/selector_switch_thumb"
+                        app:trackTint="@color/selector_switch_track" />
+
+                </LinearLayout>
+
+                <!-- ==================== -->
+                <!-- AUTO-WITHDRAW CONFIG (hidden when toggle off) -->
+                <!-- ==================== -->
+                <LinearLayout
+                    android:id="@+id/auto_withdraw_config_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
                 <!-- ==================== -->
                 <!-- DESTINATION SECTION -->
                 <!-- ==================== -->
                 <TextView
-                    android:layout_width="wrap_content"
+                    style="@style/Text.SectionHeader"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginTop="28dp"
-                    android:layout_marginBottom="12dp"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/auto_withdraw_section_destination"
-                    android:textAllCaps="true"
-                    android:textColor="@color/color_text_secondary"
-                    android:textSize="13sp"
-                    android:letterSpacing="0.03" />
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="28dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/auto_withdraw_section_destination" />
 
                 <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="20dp"
                     app:cardBackgroundColor="@color/color_bg_white"
                     app:cardCornerRadius="16dp"
                     app:cardElevation="0dp">
@@ -288,9 +280,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginBottom="12dp"
-                            android:drawableStart="@drawable/ic_lightning_bolt"
-                            android:drawablePadding="8dp"
-                            android:drawableTint="@color/color_bitcoin_orange"
                             android:fontFamily="sans-serif-medium"
                             android:text="@string/auto_withdraw_lightning_address_label"
                             android:textColor="@color/color_text_primary"
@@ -328,21 +317,18 @@
                 <!-- TRIGGER SETTINGS -->
                 <!-- ==================== -->
                 <TextView
-                    android:layout_width="wrap_content"
+                    style="@style/Text.SectionHeader"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginTop="28dp"
-                    android:layout_marginBottom="12dp"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/auto_withdraw_section_trigger"
-                    android:textAllCaps="true"
-                    android:textColor="@color/color_text_secondary"
-                    android:textSize="13sp"
-                    android:letterSpacing="0.03" />
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="28dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/auto_withdraw_section_trigger" />
 
                 <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="20dp"
                     app:cardBackgroundColor="@color/color_bg_white"
                     app:cardCornerRadius="16dp"
                     app:cardElevation="0dp">
@@ -473,12 +459,12 @@
                                 android:stepSize="1"
                                 android:valueFrom="50"
                                 android:valueTo="98"
-                                app:haloColor="@color/color_accent_blue"
+                                app:haloColor="@color/color_bitcoin_orange"
                                 app:haloRadius="24dp"
-                                app:thumbColor="@color/color_accent_blue"
+                                app:thumbColor="@color/color_bitcoin_orange"
                                 app:thumbRadius="12dp"
                                 app:tickVisible="false"
-                                app:trackColorActive="@color/color_accent_blue"
+                                app:trackColorActive="@color/color_bitcoin_orange"
                                 app:trackColorInactive="@color/color_bg_tertiary"
                                 app:trackHeight="6dp" />
 
@@ -511,115 +497,87 @@
 
                 </androidx.cardview.widget.CardView>
 
+                </LinearLayout>
+
                 <!-- ==================== -->
                 <!-- MANUAL WITHDRAW SECTION -->
                 <!-- ==================== -->
                 <TextView
-                    android:layout_width="wrap_content"
+                    style="@style/Text.SectionHeader"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginTop="28dp"
-                    android:layout_marginBottom="12dp"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/manual_withdraw_section_title"
-                    android:textAllCaps="true"
-                    android:textColor="@color/color_text_secondary"
-                    android:textSize="13sp"
-                    android:letterSpacing="0.03" />
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="28dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/manual_withdraw_section_title" />
 
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/manual_withdraw_card"
+                <LinearLayout
+                    android:id="@+id/manual_withdraw_row"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:cardBackgroundColor="@color/color_bg_card"
-                    app:cardCornerRadius="16dp"
-                    app:cardElevation="0dp">
+                    android:background="@drawable/bg_row_ripple"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingVertical="14dp"
+                    android:paddingHorizontal="20dp">
+
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginEnd="14dp"
+                        android:src="@drawable/ic_arrow_down_receive"
+                        app:tint="@color/color_icon_secondary" />
 
                     <LinearLayout
-                        android:id="@+id/manual_withdraw_row"
-                        android:layout_width="match_parent"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:background="?attr/selectableItemBackground"
-                        android:clickable="true"
-                        android:focusable="true"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:padding="20dp">
-
-                        <!-- Icon -->
-                        <FrameLayout
-                            android:layout_width="44dp"
-                            android:layout_height="44dp"
-                            android:layout_marginEnd="16dp"
-                            android:background="@drawable/bg_circle"
-                            android:backgroundTint="#FFF3E0">
-
-                            <ImageView
-                                android:layout_width="22dp"
-                                android:layout_height="22dp"
-                                android:layout_gravity="center"
-                                android:src="@drawable/ic_lightning_bolt"
-                                app:tint="@color/color_bitcoin_orange" />
-                        </FrameLayout>
+                        android:layout_weight="1"
+                        android:orientation="vertical">
 
-                        <!-- Text -->
-                        <LinearLayout
-                            android:layout_width="0dp"
+                        <TextView
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:fontFamily="sans-serif-medium"
-                                android:text="@string/manual_withdraw_title"
-                                android:textColor="@color/color_text_primary"
-                                android:textSize="17sp" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="4dp"
-                                android:text="@string/manual_withdraw_subtitle"
-                                android:textColor="@color/color_text_secondary"
-                                android:textSize="14sp" />
-
-                        </LinearLayout>
+                            android:text="@string/manual_withdraw_title"
+                            android:textAppearance="@style/Text.RowTitle" />
 
-                        <!-- Chevron -->
-                        <ImageView
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
-                            android:src="@drawable/ic_chevron_right"
-                            app:tint="@color/color_text_tertiary" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="2dp"
+                            android:text="@string/manual_withdraw_subtitle"
+                            android:textAppearance="@style/Text.RowSubtitle" />
 
                     </LinearLayout>
 
-                </androidx.cardview.widget.CardView>
+                    <ImageView
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
+                        android:src="@drawable/ic_chevron_forward"
+                        app:tint="@color/color_text_tertiary" />
+
+                </LinearLayout>
 
                 <!-- ==================== -->
                 <!-- HISTORY SECTION -->
                 <!-- ==================== -->
                 <LinearLayout
+                    android:id="@+id/history_section_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="28dp"
-                    android:layout_marginBottom="12dp"
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="28dp"
+                    android:paddingBottom="14dp"
                     android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
+                        style="@style/Text.SectionHeader"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
                         android:layout_weight="1"
-                        android:fontFamily="sans-serif"
-                        android:text="@string/auto_withdraw_section_history"
-                        android:textAllCaps="true"
-                        android:textColor="@color/color_text_secondary"
-                        android:textSize="13sp"
-                        android:letterSpacing="0.03" />
+                        android:text="@string/auto_withdraw_section_history" />
 
                     <TextView
                         android:id="@+id/see_all_button"
@@ -632,7 +590,7 @@
                         android:paddingHorizontal="8dp"
                         android:paddingVertical="4dp"
                         android:text="@string/auto_withdraw_see_all"
-                        android:textColor="@color/color_accent_blue"
+                        android:textColor="@color/color_bitcoin_orange"
                         android:textSize="14sp"
                         android:visibility="gone" />
 
@@ -642,45 +600,15 @@
                     android:id="@+id/history_card"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:cardBackgroundColor="@color/color_bg_card"
+                    android:layout_marginHorizontal="20dp"
+                    app:cardBackgroundColor="@android:color/transparent"
                     app:cardCornerRadius="16dp"
                     app:cardElevation="0dp">
 
                     <!-- Empty State -->
-                    <LinearLayout
+                    <include
                         android:id="@+id/history_empty_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:orientation="vertical"
-                        android:paddingVertical="48dp"
-                        android:visibility="visible">
-
-                        <ImageView
-                            android:layout_width="56dp"
-                            android:layout_height="56dp"
-                            android:alpha="0.3"
-                            android:src="@drawable/ic_history"
-                            app:tint="@color/color_text_secondary" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="16dp"
-                            android:fontFamily="sans-serif-medium"
-                            android:text="@string/auto_withdraw_history_empty_title"
-                            android:textColor="@color/color_text_secondary"
-                            android:textSize="16sp" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp"
-                            android:text="@string/auto_withdraw_history_empty_subtitle"
-                            android:textColor="@color/color_text_tertiary"
-                            android:textSize="14sp" />
-
-                    </LinearLayout>
+                        layout="@layout/component_empty_state" />
 
                     <!-- History List -->
                     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/activity_basket_names_settings.xml b/app/src/main/res/layout/activity_basket_names_settings.xml
index 7abf9392..916c82a1 100644
--- a/app/src/main/res/layout/activity_basket_names_settings.xml
+++ b/app/src/main/res/layout/activity_basket_names_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -21,9 +21,10 @@
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:src="@drawable/ic_chevron_back"
             android:contentDescription="@string/common_back"
             app:tint="@color/color_text_primary" />
@@ -33,15 +34,13 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/basket_names_settings_title"
-            android:textSize="20sp"
-            android:textColor="@color/color_text_primary"
-            android:fontFamily="sans-serif-medium"
+            android:textAppearance="@style/Text.Title"
             android:textAlignment="center" />
 
         <!-- Spacer to balance layout -->
         <View
-            android:layout_width="48dp"
-            android:layout_height="48dp" />
+            android:layout_width="36dp"
+            android:layout_height="36dp" />
     </LinearLayout>
 
     <ScrollView
@@ -62,35 +61,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:gravity="center_horizontal"
-                android:paddingHorizontal="24dp"
-                android:paddingTop="24dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="20dp"
                 android:paddingBottom="20dp">
 
-                <!-- Icon -->
-                <FrameLayout
-                    android:layout_width="64dp"
-                    android:layout_height="64dp"
-                    android:background="@drawable/bg_circle_accent_light">
-
-                    <ImageView
-                        android:layout_width="32dp"
-                        android:layout_height="32dp"
-                        android:layout_gravity="center"
-                        android:src="@drawable/ic_shopping_bag"
-                        app:tint="@color/color_accent_blue" />
-
-                </FrameLayout>
-
                 <!-- Description -->
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
                     android:text="@string/basket_names_settings_description"
-                    android:textSize="15sp"
-                    android:textColor="@color/color_text_secondary"
-                    android:gravity="center"
+                    android:textAppearance="@style/Text.RowSubtitle"
                     android:lineSpacingMultiplier="1.3" />
 
             </LinearLayout>
@@ -107,30 +87,23 @@
                     android:id="@+id/names_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingHorizontal="24dp"
-                    android:paddingTop="8dp"
-                    android:paddingBottom="8dp"
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="28dp"
+                    android:paddingBottom="14dp"
                     android:text="@string/basket_names_settings_presets_header"
-                    android:textSize="13sp"
-                    android:textColor="@color/color_text_secondary"
-                    android:fontFamily="sans-serif-medium"
-                    android:textAllCaps="true"
-                    android:letterSpacing="0.05"
+                    android:textAppearance="@style/Text.SectionHeader"
                     android:visibility="gone"
                     tools:visibility="visible" />
 
-                <!-- Card Container for Names -->
+                <!-- Names List -->
                 <LinearLayout
                     android:id="@+id/names_card"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
                     android:orientation="vertical"
-                    android:background="@drawable/bg_rounded_card_large"
                     android:visibility="gone"
                     tools:visibility="visible">
 
-                    <!-- Names List -->
                     <LinearLayout
                         android:id="@+id/names_list"
                         android:layout_width="match_parent"
@@ -140,81 +113,30 @@
                 </LinearLayout>
 
                 <!-- Empty State -->
-                <LinearLayout
+                <include
                     android:id="@+id/empty_state"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:gravity="center_horizontal"
-                    android:layout_marginHorizontal="16dp"
-                    android:paddingVertical="32dp"
-                    android:background="@drawable/bg_rounded_card_large"
-                    tools:visibility="gone">
-
-                    <ImageView
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:src="@drawable/ic_add_circle"
-                        app:tint="@color/color_icon_tertiary" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
-                        android:text="@string/basket_names_settings_empty_title"
-                        android:textSize="16sp"
-                        android:textColor="@color/color_text_secondary"
-                        android:fontFamily="sans-serif-medium" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
-                        android:text="@string/basket_names_settings_empty_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_tertiary"
-                        android:gravity="center" />
-
-                </LinearLayout>
+                    layout="@layout/component_empty_state" />
 
             </LinearLayout>
 
             <!-- Add Name Button -->
-            <LinearLayout
+            <Button
                 android:id="@+id/add_name_button"
+                style="@style/Widget.Button.Secondary.Outlined"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="12dp"
-                android:layout_marginHorizontal="16dp"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:paddingHorizontal="16dp"
-                android:background="@drawable/bg_rounded_card_large"
-                android:clickable="true"
-                android:focusable="true">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
-                    android:src="@drawable/ic_add"
-                    app:tint="@color/color_accent_blue" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/basket_names_settings_add_name"
-                    android:textSize="16sp"
-                    android:textColor="@color/color_accent_blue"
-                    android:fontFamily="sans-serif-medium" />
-            </LinearLayout>
+                android:layout_marginHorizontal="20dp"
+                android:text="@string/basket_names_settings_add_name"
+                android:drawableStart="@drawable/ic_add"
+                android:drawablePadding="8dp" />
 
             <!-- Example suggestions -->
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
-                android:paddingHorizontal="24dp"
+                android:paddingHorizontal="20dp"
                 android:text="@string/basket_names_settings_examples"
                 android:textSize="13sp"
                 android:textColor="@color/color_text_tertiary"
diff --git a/app/src/main/res/layout/activity_currency_settings.xml b/app/src/main/res/layout/activity_currency_settings.xml
index 7f2a85eb..f5d2c6b9 100644
--- a/app/src/main/res/layout/activity_currency_settings.xml
+++ b/app/src/main/res/layout/activity_currency_settings.xml
@@ -16,12 +16,10 @@
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="48dp"
-            android:minHeight="48dp"
-            android:padding="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/common_back"
             android:src="@drawable/ic_chevron_back"
             android:tint="@color/color_text_primary"
@@ -48,6 +46,7 @@
         app:layout_constraintTop_toBottomOf="@id/top_bar">
 
         <LinearLayout
+            android:id="@+id/currency_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -57,9 +56,9 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginBottom="4dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="14dp"
                 android:text="@string/currency_settings_section_preferred_currency"
                 android:textAppearance="@style/Text.SectionHeader" />
 
@@ -75,12 +74,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/currency_settings_option_usd"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_eur"
@@ -88,12 +86,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/currency_settings_option_eur"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_gbp"
@@ -101,12 +98,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/currency_settings_option_gbp"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_jpy"
@@ -114,12 +110,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/currency_settings_option_jpy"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_dkk"
@@ -127,12 +122,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/currency_settings_option_dkk"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_sek"
@@ -140,12 +134,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/currency_settings_option_sek"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_nok"
@@ -153,12 +146,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/currency_settings_option_nok"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_krw"
@@ -166,12 +158,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/currency_settings_option_krw"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
             </RadioGroup>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
index 6c62e559..67d8f3b5 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -110,12 +110,11 @@
         app:layout_constraintTop_toBottomOf="@id/balance_section" />
 
     <!-- Empty View -->
-    <TextView
+    <include
         android:id="@+id/empty_view"
-        style="@style/Text.Body"
+        layout="@layout/component_empty_state"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/history_empty"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_item_entry.xml b/app/src/main/res/layout/activity_item_entry.xml
index a2988df3..8cfd3a9f 100644
--- a/app/src/main/res/layout/activity_item_entry.xml
+++ b/app/src/main/res/layout/activity_item_entry.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_bg_secondary"
+    android:background="@color/color_bg_white"
     android:orientation="vertical">
 
     <!-- Top App Bar -->
@@ -13,14 +13,14 @@
         android:layout_height="56dp"
         android:background="@color/color_bg_white"
         android:elevation="1dp"
-        android:paddingHorizontal="4dp">
+        android:paddingHorizontal="8dp">
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:padding="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/item_entry_toolbar_back"
             android:src="@drawable/ic_chevron_back"
             app:tint="@color/color_text_primary"
@@ -45,7 +45,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/item_entry_button_save"
-            android:textAppearance="@style/Text.Button"
+            android:textSize="16sp"
+            android:fontFamily="sans-serif-medium"
             android:textColor="@color/color_primary_green"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -84,7 +85,7 @@
                         android:id="@+id/item_image_view"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="@color/color_bg_white"
+                        android:background="@android:color/transparent"
                         android:contentDescription="@string/item_entry_image_description"
                         android:scaleType="centerCrop" />
 
@@ -125,19 +126,20 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="20dp"
-                android:layout_marginBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/item_entry_section_basic_information"
                 android:textAppearance="@style/Text.SectionHeader" />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="24dp"
                 app:cardCornerRadius="12dp"
                 app:cardElevation="0dp"
-                app:cardBackgroundColor="@color/color_bg_white">
+                app:cardBackgroundColor="@android:color/transparent">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -152,7 +154,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
                         android:gravity="center_vertical"
-                        android:paddingHorizontal="16dp"
+                        android:paddingHorizontal="20dp"
                         android:minHeight="50dp">
 
                         <TextView
@@ -160,8 +162,7 @@
                             android:minWidth="100dp"
                             android:layout_height="wrap_content"
                             android:text="@string/item_entry_label_name"
-                            android:textAppearance="@style/Text.Body"
-                            android:textColor="@color/color_text_primary" />
+                            android:textAppearance="@style/Text.RowTitle" />
 
                         <EditText
                             android:id="@+id/item_name_input"
@@ -181,7 +182,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
                         android:gravity="center_vertical"
-                        android:paddingHorizontal="16dp"
+                        android:paddingHorizontal="20dp"
                         android:minHeight="50dp">
 
                         <TextView
@@ -189,8 +190,7 @@
                             android:minWidth="100dp"
                             android:layout_height="wrap_content"
                             android:text="@string/item_entry_label_variation"
-                            android:textAppearance="@style/Text.Body"
-                            android:textColor="@color/color_text_primary" />
+                            android:textAppearance="@style/Text.RowTitle" />
 
                         <EditText
                             android:id="@+id/item_variation_input"
@@ -210,7 +210,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
                         android:gravity="top"
-                        android:paddingHorizontal="16dp"
+                        android:paddingHorizontal="20dp"
                         android:paddingVertical="12dp"
                         android:minHeight="80dp">
 
@@ -219,8 +219,7 @@
                             android:minWidth="100dp"
                             android:layout_height="wrap_content"
                             android:text="@string/item_entry_label_description"
-                            android:textAppearance="@style/Text.Body"
-                            android:textColor="@color/color_text_primary" />
+                            android:textAppearance="@style/Text.RowTitle" />
 
                         <EditText
                             android:id="@+id/item_description_input"
@@ -242,25 +241,26 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="20dp"
-                android:layout_marginBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/item_entry_section_category"
                 android:textAppearance="@style/Text.SectionHeader" />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="8dp"
                 app:cardCornerRadius="12dp"
                 app:cardElevation="0dp"
-                app:cardBackgroundColor="@color/color_bg_white">
+                app:cardBackgroundColor="@android:color/transparent">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="16dp">
+                    android:padding="0dp">
 
                     <!-- Category Tags Flow Layout -->
                     <com.google.android.flexbox.FlexboxLayout
@@ -341,25 +341,26 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="20dp"
-                android:layout_marginBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/item_entry_section_pricing"
                 android:textAppearance="@style/Text.SectionHeader" />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="8dp"
                 app:cardCornerRadius="12dp"
                 app:cardElevation="0dp"
-                app:cardBackgroundColor="@color/color_bg_white">
+                app:cardBackgroundColor="@android:color/transparent">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="16dp">
+                    android:padding="0dp">
 
                     <!-- Price Type Toggle -->
                     <com.google.android.material.button.MaterialButtonToggleGroup
@@ -484,12 +485,12 @@
                 android:id="@+id/vat_section_card"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="8dp"
                 android:visibility="visible"
                 app:cardCornerRadius="12dp"
                 app:cardElevation="0dp"
-                app:cardBackgroundColor="@color/color_bg_white">
+                app:cardBackgroundColor="@android:color/transparent">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -504,7 +505,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
                         android:gravity="center_vertical"
-                        android:paddingHorizontal="16dp"
+                        android:paddingHorizontal="20dp"
                         android:minHeight="50dp">
 
                         <TextView
@@ -512,8 +513,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:text="@string/item_entry_label_apply_vat"
-                            android:textAppearance="@style/Text.Body"
-                            android:textColor="@color/color_text_primary" />
+                            android:textAppearance="@style/Text.RowTitle" />
 
                         <com.google.android.material.switchmaterial.SwitchMaterial
                             android:id="@+id/switch_vat_enabled"
@@ -538,7 +538,7 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
                             android:gravity="center_vertical"
-                            android:paddingHorizontal="16dp"
+                            android:paddingHorizontal="20dp"
                             android:minHeight="50dp">
 
                             <TextView
@@ -546,8 +546,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:text="@string/item_entry_label_price_includes_vat"
-                                android:textAppearance="@style/Text.Body"
-                                android:textColor="@color/color_text_primary" />
+                                android:textAppearance="@style/Text.RowTitle" />
 
                             <com.google.android.material.switchmaterial.SwitchMaterial
                                 android:id="@+id/switch_price_includes_vat"
@@ -563,7 +562,7 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
                             android:gravity="center_vertical"
-                            android:paddingHorizontal="16dp"
+                            android:paddingHorizontal="20dp"
                             android:minHeight="50dp">
 
                             <TextView
@@ -571,8 +570,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:text="@string/item_entry_label_vat_rate"
-                                android:textAppearance="@style/Text.Body"
-                                android:textColor="@color/color_text_primary" />
+                                android:textAppearance="@style/Text.RowTitle" />
 
                             <LinearLayout
                                 android:layout_width="wrap_content"
@@ -624,7 +622,7 @@
                 android:id="@+id/price_breakdown_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="8dp"
                 android:orientation="vertical"
                 android:visibility="gone"
@@ -744,19 +742,20 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="20dp"
-                android:layout_marginBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/item_entry_section_identification"
                 android:textAppearance="@style/Text.SectionHeader" />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="8dp"
                 app:cardCornerRadius="12dp"
                 app:cardElevation="0dp"
-                app:cardBackgroundColor="@color/color_bg_white">
+                app:cardBackgroundColor="@android:color/transparent">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -772,7 +771,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
                         android:gravity="center_vertical"
-                        android:paddingStart="16dp"
+                        android:paddingStart="20dp"
                         android:paddingEnd="8dp"
                         android:minHeight="50dp">
 
@@ -781,8 +780,7 @@
                             android:minWidth="60dp"
                             android:layout_height="wrap_content"
                             android:text="@string/item_entry_label_gtin"
-                            android:textAppearance="@style/Text.Body"
-                            android:textColor="@color/color_text_primary" />
+                            android:textAppearance="@style/Text.RowTitle" />
 
                         <EditText
                             android:id="@+id/item_gtin_input"
@@ -813,8 +811,8 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
                         android:gravity="center_vertical"
-                        android:paddingStart="16dp"
-                        android:paddingEnd="16dp"
+                        android:paddingStart="20dp"
+                        android:paddingEnd="20dp"
                         android:minHeight="50dp">
 
                         <TextView
@@ -822,8 +820,7 @@
                             android:minWidth="60dp"
                             android:layout_height="wrap_content"
                             android:text="@string/item_entry_label_sku"
-                            android:textAppearance="@style/Text.Body"
-                            android:textColor="@color/color_text_primary" />
+                            android:textAppearance="@style/Text.RowTitle" />
 
                         <EditText
                             android:id="@+id/item_sku_input"
@@ -869,19 +866,20 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="20dp"
-                android:layout_marginBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/item_entry_section_inventory"
                 android:textAppearance="@style/Text.SectionHeader" />
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="8dp"
                 app:cardCornerRadius="12dp"
                 app:cardElevation="0dp"
-                app:cardBackgroundColor="@color/color_bg_white">
+                app:cardBackgroundColor="@android:color/transparent">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -896,7 +894,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
                         android:gravity="center_vertical"
-                        android:paddingHorizontal="16dp"
+                        android:paddingHorizontal="20dp"
                         android:minHeight="50dp">
 
                         <TextView
@@ -904,8 +902,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:text="@string/item_entry_label_track_quantity"
-                            android:textAppearance="@style/Text.Body"
-                            android:textColor="@color/color_text_primary" />
+                            android:textAppearance="@style/Text.RowTitle" />
 
                         <com.google.android.material.switchmaterial.SwitchMaterial
                             android:id="@+id/switch_track_inventory"
@@ -930,16 +927,15 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
                             android:gravity="center_vertical"
-                            android:paddingHorizontal="16dp"
+                            android:paddingHorizontal="20dp"
                             android:minHeight="50dp">
 
                             <TextView
                                 android:layout_width="wrap_content"
-                            android:minWidth="120dp"
+                                android:minWidth="120dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/item_entry_label_current_stock"
-                                android:textAppearance="@style/Text.Body"
-                                android:textColor="@color/color_text_primary" />
+                                android:textAppearance="@style/Text.RowTitle" />
 
                             <EditText
                                 android:id="@+id/item_quantity_input"
@@ -960,7 +956,7 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
                             android:gravity="center_vertical"
-                            android:paddingHorizontal="16dp"
+                            android:paddingHorizontal="20dp"
                             android:minHeight="50dp">
 
                             <TextView
@@ -968,8 +964,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_weight="1"
                                 android:text="@string/item_entry_label_low_stock_alert"
-                                android:textAppearance="@style/Text.Body"
-                                android:textColor="@color/color_text_primary" />
+                                android:textAppearance="@style/Text.RowTitle" />
 
                             <com.google.android.material.switchmaterial.SwitchMaterial
                                 android:id="@+id/item_alert_checkbox"
@@ -985,17 +980,16 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
                             android:gravity="center_vertical"
-                            android:paddingHorizontal="16dp"
+                            android:paddingHorizontal="20dp"
                             android:minHeight="50dp"
                             android:visibility="gone">
 
                             <TextView
                                 android:layout_width="wrap_content"
-                            android:minWidth="120dp"
+                                android:minWidth="120dp"
                                 android:layout_height="wrap_content"
                                 android:text="@string/item_entry_label_alert_when_below"
-                                android:textAppearance="@style/Text.Body"
-                                android:textColor="@color/color_text_primary" />
+                                android:textAppearance="@style/Text.RowTitle" />
 
                             <EditText
                                 android:id="@+id/item_alert_threshold_input"
@@ -1029,7 +1023,7 @@
                 style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
-                android:layout_marginHorizontal="16dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="32dp"
                 android:text="@string/item_entry_button_cancel"
                 android:textAppearance="@style/Text.Button"
diff --git a/app/src/main/res/layout/activity_item_list.xml b/app/src/main/res/layout/activity_item_list.xml
index 46230c9c..1e08c94f 100644
--- a/app/src/main/res/layout/activity_item_list.xml
+++ b/app/src/main/res/layout/activity_item_list.xml
@@ -18,10 +18,10 @@
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:padding="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/item_list_toolbar_back"
             android:src="@drawable/ic_chevron_back"
             app:tint="@color/color_text_primary"
@@ -73,12 +73,13 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <!-- Divider under header -->
+    <!-- Divider under header (hidden for UI refresh) -->
     <View
         android:id="@+id/header_divider"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
         android:background="@color/color_divider"
+        android:visibility="gone"
         app:layout_anchor="@id/top_bar"
         app:layout_anchorGravity="bottom" />
 
@@ -113,12 +114,13 @@
             android:paddingBottom="24dp"
             android:background="@color/color_bg_white">
 
-            <!-- Top divider -->
+            <!-- Top divider (hidden for UI refresh) -->
             <View
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
                 android:layout_marginBottom="16dp"
-                android:background="@color/color_divider" />
+                android:background="@color/color_divider"
+                android:visibility="gone" />
 
             <!-- Import from CSV Button -->
             <Button
diff --git a/app/src/main/res/layout/activity_item_selection.xml b/app/src/main/res/layout/activity_item_selection.xml
index 422d9548..f7aeff89 100644
--- a/app/src/main/res/layout/activity_item_selection.xml
+++ b/app/src/main/res/layout/activity_item_selection.xml
@@ -39,11 +39,11 @@
 
                     <ImageButton
                         android:id="@+id/back_button"
-                        android:layout_width="44dp"
-                        android:layout_height="44dp"
-                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:background="@drawable/bg_nav_back_button"
                         android:contentDescription="@string/item_selection_toolbar_back"
-                        android:padding="10dp"
+                        android:padding="9dp"
                         android:src="@drawable/ic_chevron_back"
                         app:tint="@color/color_text_primary"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -55,9 +55,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/item_selection_toolbar_title"
-                        android:textColor="@color/color_text_primary"
-                        android:textSize="17sp"
-                        android:fontFamily="sans-serif-medium"
+                        android:textAppearance="@style/Text.Title"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -510,7 +508,7 @@
                         android:text="@string/item_selection_save_button"
                         android:textAllCaps="false"
                         android:textColor="@color/color_bg_white"
-                        android:textSize="18sp"
+                        android:textSize="16sp"
                         android:fontFamily="sans-serif-medium" />
 
                 </androidx.cardview.widget.CardView>
@@ -532,7 +530,7 @@
                         android:text="@string/item_selection_charge_button_default"
                         android:textAllCaps="false"
                         android:textColor="@color/color_bg_white"
-                        android:textSize="18sp"
+                        android:textSize="16sp"
                         android:fontFamily="sans-serif-medium"
                         tools:text="Charge" />
 
diff --git a/app/src/main/res/layout/activity_language_settings.xml b/app/src/main/res/layout/activity_language_settings.xml
index 8a5bdc7c..6366f6fa 100644
--- a/app/src/main/res/layout/activity_language_settings.xml
+++ b/app/src/main/res/layout/activity_language_settings.xml
@@ -16,12 +16,10 @@
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="48dp"
-            android:minHeight="48dp"
-            android:padding="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/common_back"
             android:src="@drawable/ic_chevron_back"
             android:tint="@color/color_text_primary"
@@ -48,6 +46,7 @@
         app:layout_constraintBottom_toBottomOf="parent">
 
         <LinearLayout
+            android:id="@+id/language_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -57,15 +56,11 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
-                android:paddingTop="24dp"
-                android:paddingBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="14dp"
                 android:text="@string/language_settings_section_app_language"
-                android:textSize="13sp"
-                android:textColor="@color/color_text_secondary"
-                android:fontFamily="sans-serif-medium"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <!-- Language Radio Group -->
             <RadioGroup
@@ -79,12 +74,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/language_settings_option_english"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_spanish"
@@ -92,12 +86,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/language_settings_option_spanish"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_portuguese"
@@ -105,12 +98,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/language_settings_option_portuguese"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
             </RadioGroup>
 
@@ -119,7 +111,7 @@
                 android:id="@+id/current_language_summary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
+                android:paddingHorizontal="20dp"
                 android:paddingTop="16dp"
                 android:textSize="14sp"
                 android:textColor="@color/color_text_secondary" />
diff --git a/app/src/main/res/layout/activity_mint_details.xml b/app/src/main/res/layout/activity_mint_details.xml
index aa9d98b3..c9b418f1 100644
--- a/app/src/main/res/layout/activity_mint_details.xml
+++ b/app/src/main/res/layout/activity_mint_details.xml
@@ -19,9 +19,10 @@
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:src="@drawable/ic_chevron_back"
             android:contentDescription="@string/common_back"
             app:tint="@color/color_text_primary" />
@@ -31,11 +32,10 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/mint_details_title"
-            android:textSize="20sp"
-            android:textColor="@color/color_text_primary"
-            android:fontFamily="sans-serif-medium"
+            android:textAppearance="@style/Text.Title"
             android:textAlignment="center" />
 
+        <!-- Spacer to balance layout -->
         <View
             android:layout_width="48dp"
             android:layout_height="48dp" />
@@ -88,7 +88,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:fillViewport="true"
-        android:background="@color/color_bg_surface"
         app:layout_constraintTop_toBottomOf="@id/error_banner"
         app:layout_constraintBottom_toBottomOf="parent">
 
@@ -99,109 +98,122 @@
             android:paddingBottom="32dp">
 
             <!-- ==================== -->
-            <!-- HEADER SECTION -->
+            <!-- HEADER SECTION (Hero Card) -->
             <!-- ==================== -->
-            <LinearLayout
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:gravity="center_horizontal"
-                android:paddingHorizontal="20dp"
-                android:paddingTop="24dp"
-                android:paddingBottom="24dp"
-                android:background="@color/color_bg_white">
+                android:layout_marginHorizontal="20dp"
+                app:cardCornerRadius="16dp"
+                app:cardBackgroundColor="@android:color/transparent"
+                app:cardElevation="0dp">
 
-                <!-- Icon -->
                 <FrameLayout
-                    android:id="@+id/icon_container"
-                    android:layout_width="80dp"
-                    android:layout_height="80dp"
-                    android:background="@drawable/bg_circle"
-                    android:backgroundTint="@color/color_bg_tertiary">
-
-                    <com.google.android.material.imageview.ShapeableImageView
-                        android:id="@+id/mint_icon"
-                        android:layout_width="78dp"
-                        android:layout_height="78dp"
-                        android:layout_gravity="center"
-                        android:scaleType="centerCrop"
-                        app:shapeAppearanceOverlay="@style/ShapeAppearance.Circle"
-                        app:strokeColor="@color/color_bg_white"
-                        app:strokeWidth="2dp"
-                        android:src="@drawable/ic_bitcoin"
-                        android:contentDescription="@string/cd_mint_icon" />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_hero_gradient_green">
 
-                </FrameLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:gravity="center_horizontal"
+                        android:padding="24dp">
+
+                        <!-- Icon -->
+                        <FrameLayout
+                            android:id="@+id/icon_container"
+                            android:layout_width="80dp"
+                            android:layout_height="80dp"
+                            android:background="@drawable/bg_circle"
+                            android:backgroundTint="@color/color_bg_tertiary">
+
+                            <com.google.android.material.imageview.ShapeableImageView
+                                android:id="@+id/mint_icon"
+                                android:layout_width="78dp"
+                                android:layout_height="78dp"
+                                android:layout_gravity="center"
+                                android:scaleType="centerCrop"
+                                app:shapeAppearanceOverlay="@style/ShapeAppearance.Circle"
+                                app:strokeColor="@color/color_bg_white"
+                                app:strokeWidth="2dp"
+                                android:src="@drawable/ic_bitcoin"
+                                android:contentDescription="@string/cd_mint_icon" />
+
+                        </FrameLayout>
+
+                        <!-- Name -->
+                        <TextView
+                            android:id="@+id/mint_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:text="Mint Name"
+                            android:textSize="24sp"
+                            android:textColor="@color/color_text_primary"
+                            android:fontFamily="sans-serif-medium"
+                            android:textAlignment="center" />
 
-                <!-- Name -->
-                <TextView
-                    android:id="@+id/mint_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:text="Mint Name"
-                    android:textSize="24sp"
-                    android:textColor="@color/color_text_primary"
-                    android:fontFamily="sans-serif-medium"
-                    android:textAlignment="center" />
+                        <!-- URL -->
+                        <TextView
+                            android:id="@+id/mint_url"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:text="mint.example.com"
+                            android:textSize="13sp"
+                            android:textColor="@color/color_text_tertiary"
+                            android:textAlignment="center" />
 
-                <!-- URL -->
-                <TextView
-                    android:id="@+id/mint_url"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:text="mint.example.com"
-                    android:textSize="14sp"
-                    android:textColor="@color/color_text_tertiary"
-                    android:textAlignment="center" />
+                        <!-- Balance Badge -->
+                        <TextView
+                            android:id="@+id/balance_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
+                            android:paddingHorizontal="20dp"
+                            android:paddingVertical="10dp"
+                            android:background="@drawable/bg_input_pill"
+                            android:text="₿0"
+                            android:textSize="18sp"
+                            android:textColor="@color/color_text_primary"
+                            android:fontFamily="sans-serif-medium" />
 
-                <!-- Balance Badge -->
-                <TextView
-                    android:id="@+id/balance_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:paddingHorizontal="20dp"
-                    android:paddingVertical="10dp"
-                    android:background="@drawable/bg_input_pill"
-                    android:text="₿0"
-                    android:textSize="18sp"
-                    android:textColor="@color/color_text_primary"
-                    android:fontFamily="sans-serif-medium" />
+                        <!-- Lightning Badge (shown if this is the lightning mint) -->
+                        <LinearLayout
+                            android:id="@+id/lightning_badge"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="12dp"
+                            android:orientation="horizontal"
+                            android:gravity="center_vertical"
+                            android:paddingHorizontal="14dp"
+                            android:paddingVertical="6dp"
+                            android:background="@drawable/bg_badge_lightning"
+                            android:visibility="gone">
 
-                <!-- Lightning Badge (shown if this is the lightning mint) -->
-                <LinearLayout
-                    android:id="@+id/lightning_badge"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:orientation="horizontal"
-                    android:gravity="center_vertical"
-                    android:paddingHorizontal="14dp"
-                    android:paddingVertical="6dp"
-                    android:background="@drawable/bg_badge_lightning"
-                    android:visibility="gone">
+                            <ImageView
+                                android:layout_width="16dp"
+                                android:layout_height="16dp"
+                                android:layout_marginEnd="6dp"
+                                android:src="@drawable/ic_lightning_bolt"
+                                app:tint="@color/color_bitcoin_orange" />
 
-                    <ImageView
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_marginEnd="6dp"
-                        android:src="@drawable/ic_lightning_bolt"
-                        app:tint="@color/color_bitcoin_orange" />
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/mints_lightning_mint"
+                                android:textSize="13sp"
+                                android:textColor="@color/color_bitcoin_orange"
+                                android:fontFamily="sans-serif-medium" />
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/mints_lightning_mint"
-                        android:textSize="13sp"
-                        android:textColor="@color/color_bitcoin_orange"
-                        android:fontFamily="sans-serif-medium" />
+                        </LinearLayout>
 
-                </LinearLayout>
+                    </LinearLayout>
 
+                </FrameLayout>
 
-            </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
             <!-- ==================== -->
             <!-- DESCRIPTION SECTION -->
@@ -211,39 +223,26 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingHorizontal="20dp"
-                android:paddingTop="24dp"
                 android:visibility="gone">
 
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginBottom="12dp"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/mint_details_about"
-                    android:textAllCaps="true"
-                    android:textColor="@color/color_text_secondary"
-                    android:textSize="13sp"
-                    android:letterSpacing="0.03" />
-
-                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:cardBackgroundColor="@color/color_bg_white"
-                    app:cardCornerRadius="16dp"
-                    app:cardElevation="0dp">
-
-                    <TextView
-                        android:id="@+id/description_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="20dp"
-                        android:textSize="15sp"
-                        android:textColor="@color/color_text_primary"
-                        android:lineSpacingMultiplier="1.4" />
+                    android:textAppearance="@style/Text.SectionHeader"
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/mint_details_about" />
 
-                </androidx.cardview.widget.CardView>
+                <TextView
+                    android:id="@+id/description_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="20dp"
+                    android:paddingVertical="14dp"
+                    android:textSize="15sp"
+                    android:textColor="@color/color_text_primary"
+                    android:lineSpacingMultiplier="1.4" />
 
             </LinearLayout>
 
@@ -255,56 +254,42 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingHorizontal="20dp"
-                android:paddingTop="24dp"
                 android:visibility="gone">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginBottom="12dp"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/mint_details_announcement"
-                    android:textAllCaps="true"
-                    android:textColor="@color/color_text_secondary"
-                    android:textSize="13sp"
-                    android:letterSpacing="0.03" />
-
-                <androidx.cardview.widget.CardView
+                    android:textAppearance="@style/Text.SectionHeader"
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="28dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/mint_details_announcement" />
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:cardBackgroundColor="#FFF8E1"
-                    app:cardCornerRadius="16dp"
-                    app:cardElevation="0dp">
+                    android:orientation="horizontal"
+                    android:paddingHorizontal="20dp"
+                    android:paddingVertical="14dp"
+                    android:gravity="center_vertical">
 
-                    <LinearLayout
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginEnd="12dp"
+                        android:src="@drawable/ic_info"
+                        app:tint="@color/color_bitcoin_orange" />
 
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:id="@+id/motd_text"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:padding="16dp"
-                        android:gravity="center_vertical">
-
-                        <ImageView
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_marginEnd="12dp"
-                            android:src="@drawable/ic_info"
-                            app:tint="@color/color_bitcoin_orange" />
-
-                        <TextView
-                            android:id="@+id/motd_text"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:textSize="14sp"
-                            android:textColor="@color/color_text_primary"
-                            android:lineSpacingMultiplier="1.3" />
-
-                    </LinearLayout>
+                        android:layout_weight="1"
+                        android:textSize="14sp"
+                        android:textColor="@color/color_text_primary"
+                        android:lineSpacingMultiplier="1.3" />
 
-                </androidx.cardview.widget.CardView>
+                </LinearLayout>
 
             </LinearLayout>
 
@@ -315,150 +300,133 @@
                 android:id="@+id/details_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingHorizontal="20dp"
-                android:paddingTop="24dp">
+                android:orientation="vertical">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginBottom="12dp"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/mint_details_details"
-                    android:textAllCaps="true"
-                    android:textColor="@color/color_text_secondary"
-                    android:textSize="13sp"
-                    android:letterSpacing="0.03" />
-
-                <androidx.cardview.widget.CardView
+                    android:textAppearance="@style/Text.SectionHeader"
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="28dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/mint_details_details" />
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:cardBackgroundColor="@color/color_bg_white"
-                    app:cardCornerRadius="16dp"
-                    app:cardElevation="0dp">
+                    android:orientation="vertical">
 
+                    <!-- URL Row -->
                     <LinearLayout
+                        android:id="@+id/url_row"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical"
+                        android:paddingVertical="14dp"
+                        android:paddingHorizontal="20dp"
+                        android:background="@drawable/bg_row_ripple"
+                        android:clickable="true"
+                        android:focusable="true">
 
-                        <!-- URL Row -->
-                        <LinearLayout
-                            android:id="@+id/url_row"
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:gravity="center_vertical"
-                            android:padding="16dp"
-                            android:background="?attr/selectableItemBackground"
-                            android:clickable="true"
-                            android:focusable="true">
+                            android:layout_weight="1"
+                            android:text="@string/mint_details_url"
+                            android:textAppearance="@style/Text.RowTitle" />
 
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:text="@string/mint_details_url"
-                                android:textSize="15sp"
-                                android:textColor="@color/color_text_secondary" />
+                        <TextView
+                            android:id="@+id/url_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:maxWidth="200dp"
+                            android:textAppearance="@style/Text.RowSubtitle"
+                            android:textAlignment="textEnd"
+                            android:maxLines="1"
+                            android:ellipsize="middle" />
 
-                            <TextView
-                                android:id="@+id/url_value"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:maxWidth="200dp"
-                                android:textSize="15sp"
-                                android:textColor="@color/color_text_primary"
-                                android:textAlignment="textEnd"
-                                android:maxLines="1"
-                                android:ellipsize="middle" />
+                        <ImageView
+                            android:layout_width="16dp"
+                            android:layout_height="16dp"
+                            android:layout_marginStart="8dp"
+                            android:src="@drawable/ic_copy"
+                            app:tint="@color/color_text_tertiary" />
 
-                            <ImageView
-                                android:layout_width="16dp"
-                                android:layout_height="16dp"
-                                android:layout_marginStart="8dp"
-                                android:src="@drawable/ic_copy"
-                                app:tint="@color/color_text_tertiary" />
+                    </LinearLayout>
 
-                        </LinearLayout>
+                    <!-- Divider -->
+                    <View
+                        android:id="@+id/url_divider"
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginStart="20dp"
+                        android:background="@color/color_divider" />
 
-                        <!-- Divider -->
-                        <View
-                            android:id="@+id/url_divider"
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_marginStart="16dp"
-                            android:background="@color/color_divider" />
+                    <!-- Software Row -->
+                    <LinearLayout
+                        android:id="@+id/software_row"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical"
+                        android:paddingVertical="14dp"
+                        android:paddingHorizontal="20dp"
+                        android:visibility="gone">
 
-                        <!-- Software Row -->
-                        <LinearLayout
-                            android:id="@+id/software_row"
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:gravity="center_vertical"
-                            android:padding="16dp"
-                            android:visibility="gone">
+                            android:layout_weight="1"
+                            android:text="@string/mint_details_software"
+                            android:textAppearance="@style/Text.RowTitle" />
 
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:text="@string/mint_details_software"
-                                android:textSize="15sp"
-                                android:textColor="@color/color_text_secondary" />
+                        <TextView
+                            android:id="@+id/software_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/Text.RowSubtitle"
+                            android:textAlignment="textEnd" />
 
-                            <TextView
-                                android:id="@+id/software_value"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:textSize="15sp"
-                                android:textColor="@color/color_text_primary"
-                                android:textAlignment="textEnd" />
+                    </LinearLayout>
 
-                        </LinearLayout>
+                    <!-- Divider -->
+                    <View
+                        android:id="@+id/software_divider"
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginStart="20dp"
+                        android:background="@color/color_divider"
+                        android:visibility="gone" />
 
-                        <!-- Divider -->
-                        <View
-                            android:id="@+id/software_divider"
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_marginStart="16dp"
-                            android:background="@color/color_divider"
-                            android:visibility="gone" />
+                    <!-- Version Row -->
+                    <LinearLayout
+                        android:id="@+id/version_row"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:gravity="center_vertical"
+                        android:paddingVertical="14dp"
+                        android:paddingHorizontal="20dp"
+                        android:visibility="gone">
 
-                        <!-- Version Row -->
-                        <LinearLayout
-                            android:id="@+id/version_row"
-                            android:layout_width="match_parent"
+                        <TextView
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:gravity="center_vertical"
-                            android:padding="16dp"
-                            android:visibility="gone">
-
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:text="@string/mint_details_version"
-                                android:textSize="15sp"
-                                android:textColor="@color/color_text_secondary" />
-
-                            <TextView
-                                android:id="@+id/version_value"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:textSize="15sp"
-                                android:textColor="@color/color_text_primary"
-                                android:textAlignment="textEnd" />
+                            android:layout_weight="1"
+                            android:text="@string/mint_details_version"
+                            android:textAppearance="@style/Text.RowTitle" />
 
-                        </LinearLayout>
+                        <TextView
+                            android:id="@+id/version_value"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/Text.RowSubtitle"
+                            android:textAlignment="textEnd" />
 
                     </LinearLayout>
 
-                </androidx.cardview.widget.CardView>
+                </LinearLayout>
 
             </LinearLayout>
 
@@ -470,36 +438,22 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingHorizontal="20dp"
-                android:paddingTop="24dp"
                 android:visibility="gone">
 
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginBottom="12dp"
-                    android:fontFamily="sans-serif"
-                    android:text="@string/mint_details_contact"
-                    android:textAllCaps="true"
-                    android:textColor="@color/color_text_secondary"
-                    android:textSize="13sp"
-                    android:letterSpacing="0.03" />
-
-                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:cardBackgroundColor="@color/color_bg_white"
-                    app:cardCornerRadius="16dp"
-                    app:cardElevation="0dp">
-
-                    <LinearLayout
-                        android:id="@+id/contact_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical" />
+                    android:textAppearance="@style/Text.SectionHeader"
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="28dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/mint_details_contact" />
 
-                </androidx.cardview.widget.CardView>
+                <LinearLayout
+                    android:id="@+id/contact_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical" />
 
             </LinearLayout>
 
@@ -507,136 +461,120 @@
             <!-- ACTIONS SECTION -->
             <!-- ==================== -->
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="28dp"
-                android:layout_marginBottom="12dp"
-                android:fontFamily="sans-serif"
-                android:text="@string/mint_details_actions"
-                android:textAllCaps="true"
-                android:textColor="@color/color_text_secondary"
-                android:textSize="13sp"
-                android:letterSpacing="0.03" />
+                android:textAppearance="@style/Text.SectionHeader"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
+                android:text="@string/mint_details_actions" />
 
-            <androidx.cardview.widget.CardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="20dp"
-                app:cardBackgroundColor="@color/color_bg_white"
-                app:cardCornerRadius="16dp"
-                app:cardElevation="0dp">
+                android:orientation="vertical">
 
+                <!-- Set as Lightning Mint Button -->
                 <LinearLayout
+                    android:id="@+id/set_lightning_button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:paddingVertical="14dp"
+                    android:paddingHorizontal="20dp"
+                    android:background="@drawable/bg_row_ripple"
+                    android:clickable="true"
+                    android:focusable="true">
 
-                    <!-- Set as Lightning Mint Button -->
-                    <LinearLayout
-                        android:id="@+id/set_lightning_button"
-                        android:layout_width="match_parent"
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginEnd="16dp"
+                        android:src="@drawable/ic_lightning_bolt"
+                        app:tint="@color/color_icon_secondary" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical"
-                        android:padding="20dp"
-                        android:background="?attr/selectableItemBackground"
-                        android:clickable="true"
-                        android:focusable="true">
+                        android:textAppearance="@style/Text.RowTitle"
+                        android:text="@string/mints_set_as_lightning" />
 
-                        <ImageView
-                            android:layout_width="22dp"
-                            android:layout_height="22dp"
-                            android:layout_marginEnd="16dp"
-                            android:src="@drawable/ic_lightning_bolt"
-                            app:tint="@color/color_bitcoin_orange" />
+                </LinearLayout>
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/mints_set_as_lightning"
-                            android:textSize="17sp"
-                            android:textColor="@color/color_text_primary"
-                            android:fontFamily="sans-serif-medium" />
+                <!-- Divider -->
+                <View
+                    android:id="@+id/action_divider_1"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="58dp"
+                    android:background="@color/color_divider" />
 
-                    </LinearLayout>
+                <!-- Copy URL Button -->
+                <LinearLayout
+                    android:id="@+id/copy_url_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:paddingVertical="14dp"
+                    android:paddingHorizontal="20dp"
+                    android:background="@drawable/bg_row_ripple"
+                    android:clickable="true"
+                    android:focusable="true">
 
-                    <!-- Divider -->
-                    <View
-                        android:id="@+id/action_divider_1"
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_marginStart="58dp"
-                        android:background="@color/color_divider" />
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginEnd="16dp"
+                        android:src="@drawable/ic_copy"
+                        app:tint="@color/color_icon_secondary" />
 
-                    <!-- Copy URL Button -->
-                    <LinearLayout
-                        android:id="@+id/copy_url_button"
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical"
-                        android:padding="20dp"
-                        android:background="?attr/selectableItemBackground"
-                        android:clickable="true"
-                        android:focusable="true">
+                        android:textAppearance="@style/Text.RowTitle"
+                        android:text="@string/mint_details_copy_url" />
 
-                        <ImageView
-                            android:layout_width="22dp"
-                            android:layout_height="22dp"
-                            android:layout_marginEnd="16dp"
-                            android:src="@drawable/ic_copy"
-                            app:tint="@color/color_text_primary" />
+                </LinearLayout>
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/mint_details_copy_url"
-                            android:textSize="17sp"
-                            android:textColor="@color/color_text_primary"
-                            android:fontFamily="sans-serif-medium" />
+                <!-- Divider -->
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="58dp"
+                    android:background="@color/color_divider" />
 
-                    </LinearLayout>
+                <!-- Delete Button -->
+                <LinearLayout
+                    android:id="@+id/delete_button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="center_vertical"
+                    android:paddingVertical="14dp"
+                    android:paddingHorizontal="20dp"
+                    android:background="@drawable/bg_row_ripple"
+                    android:clickable="true"
+                    android:focusable="true">
 
-                    <!-- Divider -->
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_marginStart="58dp"
-                        android:background="@color/color_divider" />
+                    <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginEnd="16dp"
+                        android:src="@drawable/ic_trash"
+                        app:tint="@color/color_error" />
 
-                    <!-- Delete Button -->
-                    <LinearLayout
-                        android:id="@+id/delete_button"
-                        android:layout_width="match_parent"
+                    <TextView
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical"
-                        android:padding="20dp"
-                        android:background="?attr/selectableItemBackground"
-                        android:clickable="true"
-                        android:focusable="true">
-
-                        <ImageView
-                            android:layout_width="22dp"
-                            android:layout_height="22dp"
-                            android:layout_marginEnd="16dp"
-                            android:src="@drawable/ic_trash"
-                            app:tint="@color/color_error" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/mint_details_delete"
-                            android:textSize="17sp"
-                            android:textColor="@color/color_error"
-                            android:fontFamily="sans-serif-medium" />
-
-                    </LinearLayout>
+                        android:textAppearance="@style/Text.RowTitle"
+                        android:text="@string/mint_details_delete"
+                        android:textColor="@color/color_error" />
 
                 </LinearLayout>
 
-            </androidx.cardview.widget.CardView>
+            </LinearLayout>
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/activity_mints_settings.xml b/app/src/main/res/layout/activity_mints_settings.xml
index 7f1952a8..753471f7 100644
--- a/app/src/main/res/layout/activity_mints_settings.xml
+++ b/app/src/main/res/layout/activity_mints_settings.xml
@@ -6,46 +6,51 @@
     android:background="@color/color_bg_white">
 
     <!-- Top Bar -->
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/top_bar"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:paddingHorizontal="8dp"
-        android:elevation="0dp"
         android:background="@color/color_bg_white"
+        android:paddingHorizontal="16dp"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/ic_chevron_back"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/common_back"
-            app:tint="@color/color_text_primary" />
+            android:src="@drawable/ic_chevron_back"
+            android:tint="@color/color_text_primary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:text="@string/mints_explore_title"
-            android:textSize="20sp"
-            android:textColor="@color/color_text_primary"
-            android:fontFamily="sans-serif-medium"
-            android:textAlignment="center" />
+            android:textAppearance="@style/Text.Title"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageButton
             android:id="@+id/reset_button"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:src="@drawable/ic_refresh"
             android:contentDescription="@string/mints_reset_description"
-            app:tint="@color/color_text_tertiary" />
+            app:tint="@color/color_text_tertiary"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <!-- Scrollable Content -->
     <ScrollView
@@ -54,11 +59,11 @@
         android:layout_height="0dp"
         android:clipToPadding="false"
         android:fillViewport="true"
-        android:background="@color/color_bg_surface"
         app:layout_constraintTop_toBottomOf="@id/top_bar"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <LinearLayout
+            android:id="@+id/mints_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -72,7 +77,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingHorizontal="20dp"
                 android:paddingTop="16dp"
                 android:visibility="gone">
 
@@ -80,190 +84,224 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginBottom="12dp"
-                    android:fontFamily="sans-serif"
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="16dp"
+                    android:paddingBottom="14dp"
                     android:text="@string/mints_lightning_mint"
-                    android:textAllCaps="true"
-                    android:textColor="@color/color_text_secondary"
-                    android:textSize="13sp"
-                    android:letterSpacing="0.03" />
+                    android:textAppearance="@style/Text.SectionHeader" />
 
-                <!-- Lightning Mint Card -->
-                <androidx.cardview.widget.CardView
+                <!-- Lightning Mint Hero Card -->
+                <FrameLayout
                     android:id="@+id/lightning_mint_card"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:cardBackgroundColor="@color/color_bg_card"
-                    app:cardCornerRadius="16dp"
-                    app:cardElevation="0dp">
+                    android:layout_marginHorizontal="20dp"
+                    android:clipChildren="false">
 
-                    <LinearLayout
+                    <androidx.cardview.widget.CardView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:padding="20dp">
+                        app:cardBackgroundColor="@android:color/transparent"
+                        app:cardCornerRadius="16dp"
+                        app:cardElevation="0dp">
 
-                        <!-- Top Row: Icon + Name/URL -->
-                        <LinearLayout
+                        <FrameLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:gravity="center_vertical">
+                            android:background="@drawable/bg_hero_gradient_green"
+                            android:clipChildren="false">
 
-                            <!-- Icon Container (circular avatar) -->
+                            <!-- Decorative background lightning bolt with fade -->
                             <FrameLayout
-                                android:id="@+id/lightning_icon_container"
-                                android:layout_width="52dp"
-                                android:layout_height="52dp"
-                                android:layout_marginEnd="16dp">
-
-                                <com.google.android.material.imageview.ShapeableImageView
-                                    android:id="@+id/lightning_mint_icon"
-                                    android:layout_width="52dp"
-                                    android:layout_height="52dp"
-                                    android:layout_gravity="center"
-                                    android:scaleType="centerCrop"
-                                    android:background="@color/color_bg_tertiary"
-                                    android:src="@drawable/ic_bitcoin"
-                                    app:shapeAppearanceOverlay="@style/ShapeAppearance.Circle"
-                                    app:strokeColor="@color/color_bg_white"
-                                    app:strokeWidth="2dp"
-                                    android:contentDescription="@string/cd_mint_icon" />
+                                android:layout_width="140dp"
+                                android:layout_height="140dp"
+                                android:layout_gravity="bottom|end"
+                                android:layout_marginEnd="-30dp"
+                                android:layout_marginBottom="-30dp">
+
+                                <ImageView
+                                    android:id="@+id/hero_bolt"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:alpha="0.08"
+                                    android:importantForAccessibility="no"
+                                    android:rotation="-15"
+                                    android:src="@drawable/ic_lightning_bolt"
+                                    app:tint="@color/color_success_green" />
+
+                                <View
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:background="@drawable/bg_hero_bolt_fade_green" />
 
                             </FrameLayout>
 
-                            <!-- Text Content -->
+                            <!-- Content -->
                             <LinearLayout
-                                android:layout_width="0dp"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:orientation="vertical">
+                                android:orientation="vertical"
+                                android:padding="24dp">
 
-                                <TextView
-                                    android:id="@+id/lightning_mint_name"
-                                    android:layout_width="wrap_content"
+                                <!-- Top Row: Icon + Name/URL -->
+                                <LinearLayout
+                                    android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:fontFamily="sans-serif-medium"
-                                    android:text="Lightning Mint"
-                                    android:textColor="@color/color_text_primary"
-                                    android:textSize="17sp"
-                                    android:maxLines="1"
-                                    android:ellipsize="end" />
-
+                                    android:layout_marginTop="16dp"
+                                    android:orientation="horizontal"
+                                    android:gravity="center_vertical">
+
+                                    <!-- Icon Container (circular avatar) -->
+                                    <FrameLayout
+                                        android:id="@+id/lightning_icon_container"
+                                        android:layout_width="52dp"
+                                        android:layout_height="52dp"
+                                        android:layout_marginEnd="16dp">
+
+                                        <com.google.android.material.imageview.ShapeableImageView
+                                            android:id="@+id/lightning_mint_icon"
+                                            android:layout_width="52dp"
+                                            android:layout_height="52dp"
+                                            android:layout_gravity="center"
+                                            android:scaleType="centerCrop"
+                                            android:background="@color/color_bg_tertiary"
+                                            android:src="@drawable/ic_bitcoin"
+                                            app:shapeAppearanceOverlay="@style/ShapeAppearance.Circle"
+                                            app:strokeColor="@color/color_bg_white"
+                                            app:strokeWidth="2dp"
+                                            android:contentDescription="@string/cd_mint_icon" />
+
+                                    </FrameLayout>
+
+                                    <!-- Text Content -->
+                                    <LinearLayout
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:orientation="vertical">
+
+                                        <TextView
+                                            android:id="@+id/lightning_mint_name"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:fontFamily="sans-serif-medium"
+                                            android:text="Lightning Mint"
+                                            android:textColor="@color/color_text_primary"
+                                            android:textSize="17sp"
+                                            android:maxLines="1"
+                                            android:ellipsize="end" />
+
+                                        <TextView
+                                            android:id="@+id/lightning_mint_url"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="2dp"
+                                            android:text="mint.example.com"
+                                            android:textColor="@color/color_text_tertiary"
+                                            android:textSize="13sp"
+                                            android:maxLines="1"
+                                            android:ellipsize="end" />
+
+                                    </LinearLayout>
+
+                                </LinearLayout>
+
+                                <!-- Divider -->
+                                <View
+                                    android:layout_width="match_parent"
+                                    android:layout_height="1dp"
+                                    android:layout_marginTop="16dp"
+                                    android:layout_marginBottom="14dp"
+                                    android:background="@color/color_divider" />
+
+                                <!-- Balance Row -->
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal"
+                                    android:gravity="center_vertical">
+
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/mints_balance"
+                                        android:textSize="15sp"
+                                        android:textColor="@color/color_text_secondary" />
+
+                                    <View
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:layout_weight="1" />
+
+                                    <TextView
+                                        android:id="@+id/lightning_mint_balance"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="&#8383;0"
+                                        android:textSize="17sp"
+                                        android:textColor="@color/color_text_primary"
+                                        android:fontFamily="sans-serif-medium" />
+
+                                </LinearLayout>
+
+                                <!-- Description -->
                                 <TextView
-                                    android:id="@+id/lightning_mint_url"
-                                    android:layout_width="wrap_content"
+                                    android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="2dp"
-                                    android:text="mint.example.com"
-                                    android:textColor="@color/color_text_tertiary"
+                                    android:layout_marginTop="14dp"
+                                    android:text="@string/mints_lightning_description"
                                     android:textSize="13sp"
-                                    android:maxLines="1"
-                                    android:ellipsize="end" />
-
-                            </LinearLayout>
-
-                            <!-- Lightning Badge -->
-                            <ImageView
-                                android:layout_width="28dp"
-                                android:layout_height="28dp"
-                                android:src="@drawable/ic_lightning_bolt"
-                                app:tint="@color/color_bitcoin_orange"
-                                android:contentDescription="@null" />
-
-                        </LinearLayout>
-
-                        <!-- Divider -->
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_marginTop="16dp"
-                            android:layout_marginBottom="14dp"
-                            android:background="@color/color_divider" />
-
-                        <!-- Balance Row -->
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal"
-                            android:gravity="center_vertical">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/mints_balance"
-                                android:textSize="15sp"
-                                android:textColor="@color/color_text_secondary" />
-
-                            <View
-                                android:layout_width="0dp"
-                                android:layout_height="0dp"
-                                android:layout_weight="1" />
-
-                            <TextView
-                                android:id="@+id/lightning_mint_balance"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="₿0"
-                                android:textSize="17sp"
-                                android:textColor="@color/color_text_primary"
-                                android:fontFamily="sans-serif-medium" />
-
-                        </LinearLayout>
-
-                        <!-- Description -->
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="14dp"
-                            android:text="@string/mints_lightning_description"
-                            android:textSize="13sp"
-                            android:textColor="@color/color_text_tertiary"
-                            android:lineSpacingMultiplier="1.3" />
-
-                        <!-- Swap-to-Lightning-mint option -->
-                        <LinearLayout
-                            android:id="@+id/swap_unknown_mints_row"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="16dp"
-                            android:orientation="horizontal"
-                            android:gravity="center_vertical">
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:orientation="vertical">
+                                    android:textColor="@color/color_text_tertiary"
+                                    android:lineSpacingMultiplier="1.3" />
 
-                                <TextView
-                                    android:layout_width="wrap_content"
+                                <!-- Swap-to-Lightning-mint option -->
+                                <LinearLayout
+                                    android:id="@+id/swap_unknown_mints_row"
+                                    android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:text="@string/mints_swap_unknown_mints_title"
-                                    android:textSize="15sp"
-                                    android:textColor="@color/color_text_primary"
-                                    android:fontFamily="sans-serif-medium" />
+                                    android:layout_marginTop="16dp"
+                                    android:orientation="horizontal"
+                                    android:gravity="center_vertical">
+
+                                    <LinearLayout
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:orientation="vertical">
+
+                                        <TextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:text="@string/mints_swap_unknown_mints_title"
+                                            android:textSize="15sp"
+                                            android:textColor="@color/color_text_primary"
+                                            android:fontFamily="sans-serif-medium" />
+
+                                        <TextView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_marginTop="2dp"
+                                            android:text="@string/mints_swap_unknown_mints_subtitle"
+                                            android:textSize="13sp"
+                                            android:textColor="@color/color_text_tertiary" />
+                                    </LinearLayout>
+
+                                    <androidx.appcompat.widget.SwitchCompat
+                                        android:id="@+id/swap_unknown_mints_switch"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        app:thumbTint="@color/selector_switch_thumb"
+                                        app:trackTint="@color/selector_switch_track" />
+
+                                </LinearLayout>
 
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="2dp"
-                                    android:text="@string/mints_swap_unknown_mints_subtitle"
-                                    android:textSize="13sp"
-                                    android:textColor="@color/color_text_tertiary" />
                             </LinearLayout>
 
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/swap_unknown_mints_switch"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content" />
-
-                        </LinearLayout>
+                        </FrameLayout>
 
-                    </LinearLayout>
+                    </androidx.cardview.widget.CardView>
 
-                </androidx.cardview.widget.CardView>
+                </FrameLayout>
 
             </LinearLayout>
 
@@ -274,15 +312,11 @@
                 android:id="@+id/all_mints_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="28dp"
-                android:layout_marginBottom="12dp"
-                android:fontFamily="sans-serif"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/mints_all_mints"
-                android:textAllCaps="true"
-                android:textColor="@color/color_text_secondary"
-                android:textSize="13sp"
-                android:letterSpacing="0.03" />
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <!-- Mints Card -->
             <androidx.cardview.widget.CardView
@@ -324,7 +358,7 @@
                             android:id="@+id/total_balance_value"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="₿0"
+                            android:text="&#8383;0"
                             android:textSize="17sp"
                             android:textColor="@color/color_text_primary"
                             android:fontFamily="sans-serif-medium" />
@@ -394,22 +428,20 @@
                 android:id="@+id/add_mint_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="28dp"
-                android:layout_marginBottom="12dp"
-                android:fontFamily="sans-serif"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/mints_add_section"
-                android:textAllCaps="true"
-                android:textColor="@color/color_text_secondary"
-                android:textSize="13sp"
-                android:letterSpacing="0.03" />
+                android:textAppearance="@style/Text.SectionHeader" />
 
-            <com.electricdreams.numo.ui.components.AddMintInputCard
-                android:id="@+id/add_mint_card"
+            <Button
+                android:id="@+id/add_mint_button"
+                style="@style/Widget.Button.Secondary.Outlined"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="20dp"
-                android:layout_marginBottom="16dp" />
+                android:text="+ Add New Mint"
+                android:gravity="center" />
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
index f0d60fa0..6f14acdf 100644
--- a/app/src/main/res/layout/activity_onboarding.xml
+++ b/app/src/main/res/layout/activity_onboarding.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_bg_light">
+    android:background="@color/numo_navy">
 
     <!-- ======================== -->
     <!-- STEP 1: WELCOME SCREEN   -->
@@ -23,16 +23,6 @@
             android:layout_height="match_parent"
             android:background="@android:color/white" />
 
-        <!-- Navy curve - hidden in new design, kept for ID compatibility -->
-        <ImageView
-            android:id="@+id/welcome_navy_curve"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/bg_welcome_curve"
-            android:scaleType="fitXY"
-            android:visibility="gone"
-            android:alpha="0" />
-
         <!-- Emoji container (BEFORE content so emojis render behind text) -->
         <FrameLayout
             android:id="@+id/emoji_burst_container"
@@ -54,14 +44,29 @@
                 android:layout_height="0dp"
                 android:layout_weight="1" />
 
-            <!-- Numo Wordmark (white vector, tinted navy by animator initially) -->
-            <ImageView
-                android:id="@+id/welcome_wordmark"
+            <!-- Numo Wordmark (white + green overlay for color fill animation) -->
+            <FrameLayout
                 android:layout_width="200dp"
-                android:layout_height="88dp"
-                android:src="@drawable/ic_numo_wordmark_white"
-                android:contentDescription="@string/app_name"
-                android:alpha="0" />
+                android:layout_height="88dp">
+
+                <ImageView
+                    android:id="@+id/welcome_wordmark"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/ic_numo_wordmark_white"
+                    android:contentDescription="@string/app_name"
+                    android:alpha="0" />
+
+                <ImageView
+                    android:id="@+id/welcome_wordmark_green"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/ic_numo_wordmark_white"
+                    app:tint="@color/numo_fluorescent_green"
+                    android:contentDescription="@null"
+                    android:alpha="0" />
+
+            </FrameLayout>
 
             <!-- Tagline (color set by animator: starts navy, transitions to white) -->
             <TextView
@@ -125,171 +130,272 @@
         android:id="@+id/choose_path_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/numo_navy"
         android:visibility="gone">
 
-        <LinearLayout
+        <!-- Scrollable content + teaser -->
+        <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:paddingHorizontal="24dp">
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="0.15" />
-
-            <!-- Title -->
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/onboarding_setup_title"
-                android:textSize="28sp"
-                android:textColor="@color/color_text_primary"
-                android:fontFamily="sans-serif-medium"
-                android:gravity="center" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:text="@string/onboarding_setup_subtitle"
-                android:textSize="16sp"
-                android:textColor="@color/color_text_secondary"
-                android:gravity="center" />
-
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="0.15" />
+            android:fillViewport="true"
+            android:scrollbars="none">
 
-            <!-- Create New Wallet Card -->
             <LinearLayout
-                android:id="@+id/create_wallet_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:background="@drawable/bg_onboarding_option_card"
-                android:padding="24dp"
-                android:clickable="true"
-                android:focusable="true">
+                android:orientation="vertical">
 
+                <!-- Setup content -->
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center_vertical">
+                    android:orientation="vertical"
+                    android:paddingHorizontal="24dp"
+                    android:paddingTop="48dp">
 
-                    <ImageView
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:src="@drawable/ic_add_circle"
-                        android:contentDescription="@string/onboarding_create_wallet_title"
-                        app:tint="@color/color_success_green" />
+                    <!-- Title -->
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/onboarding_setup_title"
+                        android:textSize="32sp"
+                        android:textColor="#FFFFFF"
+                        android:fontFamily="sans-serif-black"
+                        android:textAllCaps="true"
+                        android:letterSpacing="-0.03"
+                        android:lineSpacingMultiplier="1.05" />
+
+                    <Space
+                        android:layout_width="match_parent"
+                        android:layout_height="48dp" />
 
+                    <!-- Create New Wallet (primary CTA) -->
                     <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:orientation="vertical"
-                        android:layout_marginStart="16dp">
+                        android:id="@+id/create_wallet_button"
+                        android:layout_width="match_parent"
+                        android:layout_height="56dp"
+                        android:orientation="horizontal"
+                        android:gravity="center"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:background="@drawable/bg_button_white">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/onboarding_create_wallet_title"
-                            android:textSize="17sp"
-                            android:textColor="@color/color_text_primary"
+                            android:textSize="16sp"
+                            android:textColor="#0A2540"
                             android:fontFamily="sans-serif-medium" />
 
+                    </LinearLayout>
+
+                    <Space
+                        android:layout_width="match_parent"
+                        android:layout_height="24dp" />
+
+                    <!-- Restore from Backup (secondary action) -->
+                    <LinearLayout
+                        android:id="@+id/restore_wallet_button"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:gravity="center"
+                        android:paddingVertical="12dp"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:background="?attr/selectableItemBackground">
+
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp"
-                            android:text="@string/onboarding_create_wallet_subtitle"
+                            android:text="@string/onboarding_restore_wallet_title"
                             android:textSize="14sp"
-                            android:textColor="@color/color_text_secondary" />
+                            android:textColor="#80FFFFFF"
+                            android:fontFamily="sans-serif" />
 
                     </LinearLayout>
 
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_chevron_right"
-                        app:tint="@color/color_text_tertiary" />
-
                 </LinearLayout>
 
+                <!-- Flexible spacer pushes teaser to bottom on large screens -->
+                <Space
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+                <!-- "How does Numo work?" title above the card -->
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="24dp"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="12dp"
+                    android:text="@string/explainer_teaser_subtitle"
+                    android:textSize="16sp"
+                    android:fontFamily="sans-serif-medium"
+                    android:textColor="#99FFFFFF"
+                    android:textAllCaps="true"
+                    android:letterSpacing="0.05" />
+
+                <!-- Teaser card -->
+                <FrameLayout
+                    android:id="@+id/teaser_card"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="16dp"
+                    android:paddingBottom="34dp"
+                    android:clickable="true"
+                    android:focusable="true">
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:cardCornerRadius="20dp"
+                        app:cardElevation="0dp"
+                        app:cardBackgroundColor="@color/numo_fluorescent_green">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical"
+                                android:paddingTop="20dp"
+                                android:paddingHorizontal="24dp"
+                                android:paddingBottom="12dp">
+
+                                <!-- "Tap. Pay. Done." tagline -->
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/explainer_teaser_title"
+                                    android:textSize="24sp"
+                                    android:fontFamily="sans-serif-black"
+                                    android:textColor="@color/numo_navy"
+                                    android:textAllCaps="true"
+                                    android:letterSpacing="-0.03"
+                                    android:lineSpacingMultiplier="1.05" />
+
+                            </LinearLayout>
+
+                            <ImageView
+                                android:id="@+id/teaser_illustration"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:adjustViewBounds="true"
+                                android:src="@drawable/img_tap_to_pay"
+                                android:scaleType="fitCenter"
+                                android:contentDescription="@string/explainer_image_placeholder" />
+
+                        </LinearLayout>
+
+                    </com.google.android.material.card.MaterialCardView>
+
+                </FrameLayout>
+
             </LinearLayout>
 
-            <Space
+        </ScrollView>
+
+        <!-- Explainer overlay -->
+        <FrameLayout
+            android:id="@+id/explainer_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone">
+
+            <!-- Backdrop -->
+            <View
+                android:id="@+id/explainer_backdrop"
                 android:layout_width="match_parent"
-                android:layout_height="16dp" />
+                android:layout_height="match_parent"
+                android:background="#80000000"
+                android:alpha="0" />
 
-            <!-- Restore Wallet Card -->
+            <!-- Sheet -->
             <LinearLayout
-                android:id="@+id/restore_wallet_button"
+                android:id="@+id/explainer_sheet"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:orientation="vertical"
-                android:background="@drawable/bg_onboarding_option_card"
-                android:padding="24dp"
-                android:clickable="true"
-                android:focusable="true">
+                android:background="@color/numo_navy"
+                android:translationY="2000dp">
 
-                <LinearLayout
+                <!-- Close button -->
+                <FrameLayout
+                    android:id="@+id/explainer_close_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center_vertical">
+                    android:paddingStart="20dp">
 
                     <ImageView
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:src="@drawable/ic_restore"
-                        android:contentDescription="@string/onboarding_restore_wallet_title"
-                        app:tint="@color/color_accent_blue" />
-
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:orientation="vertical"
-                        android:layout_marginStart="16dp">
+                        android:id="@+id/explainer_close_btn"
+                        android:layout_width="44dp"
+                        android:layout_height="44dp"
+                        android:padding="10dp"
+                        android:src="@drawable/ic_close"
+                        app:tint="#FFFFFF"
+                        android:alpha="0.7"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:contentDescription="@string/navigation_drawer_close" />
+
+                </FrameLayout>
+
+                <!-- Slides ViewPager -->
+                <androidx.viewpager2.widget.ViewPager2
+                    android:id="@+id/explainer_view_pager"
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical" />
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/onboarding_restore_wallet_title"
-                            android:textSize="17sp"
-                            android:textColor="@color/color_text_primary"
-                            android:fontFamily="sans-serif-medium" />
+                <!-- Swipe hint chevrons -->
+                <LinearLayout
+                    android:id="@+id/chevron_hint_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:gravity="center_horizontal"
+                    android:paddingTop="16dp">
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp"
-                            android:text="@string/onboarding_restore_wallet_subtitle"
-                            android:textSize="14sp"
-                            android:textColor="@color/color_text_secondary" />
+                    <ImageView
+                        android:id="@+id/chevron_hint_1"
+                        android:layout_width="24dp"
+                        android:layout_height="14dp"
+                        android:src="@drawable/ic_chevron_down_hint"
+                        android:alpha="0.12"
+                        android:contentDescription="@null" />
 
-                    </LinearLayout>
+                    <ImageView
+                        android:id="@+id/chevron_hint_2"
+                        android:layout_width="24dp"
+                        android:layout_height="14dp"
+                        android:layout_marginTop="-6dp"
+                        android:src="@drawable/ic_chevron_down_hint"
+                        android:alpha="0.12"
+                        android:contentDescription="@null" />
 
                     <ImageView
+                        android:id="@+id/chevron_hint_3"
                         android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_chevron_right"
-                        app:tint="@color/color_text_tertiary" />
+                        android:layout_height="14dp"
+                        android:layout_marginTop="-6dp"
+                        android:src="@drawable/ic_chevron_down_hint"
+                        android:alpha="0.12"
+                        android:contentDescription="@null" />
 
                 </LinearLayout>
 
             </LinearLayout>
 
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="0.7" />
+        </FrameLayout>
 
-        </LinearLayout>
     </FrameLayout>
 
     <!-- ======================== -->
@@ -306,39 +412,32 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <!-- Top Bar -->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="56dp"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:paddingHorizontal="8dp">
-
-                <ImageView
-                    android:id="@+id/seed_back_button"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:padding="12dp"
-                    android:src="@drawable/ic_arrow_back"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    app:tint="@color/color_text_primary"
-                    android:contentDescription="@string/onboarding_seed_toolbar_back" />
-
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/onboarding_seed_toolbar_title"
-                    android:textSize="17sp"
-                    android:textColor="@color/color_text_primary"
-                    android:fontFamily="sans-serif-medium"
-                    android:gravity="center" />
-
-                <Space
-                    android:layout_width="48dp"
-                    android:layout_height="48dp" />
+            <!-- Back button -->
+            <ImageView
+                android:id="@+id/seed_back_button"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:padding="12dp"
+                android:src="@drawable/ic_chevron_back"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                app:tint="#99FFFFFF"
+                android:contentDescription="@string/onboarding_seed_toolbar_back" />
 
-            </LinearLayout>
+            <!-- Title -->
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="24dp"
+                android:paddingTop="8dp"
+                android:text="@string/onboarding_seed_toolbar_title"
+                android:textSize="32sp"
+                android:textColor="@color/numo_fluorescent_green"
+                android:fontFamily="sans-serif-black"
+                android:textAllCaps="true"
+                android:letterSpacing="-0.03"
+                android:lineSpacingMultiplier="1.05" />
 
             <ScrollView
                 android:layout_width="match_parent"
@@ -360,18 +459,9 @@
                         android:layout_marginTop="16dp"
                         android:text="@string/onboarding_seed_instruction_title"
                         android:textSize="24sp"
-                        android:textColor="@color/color_text_primary"
+                        android:textColor="#FFFFFF"
                         android:fontFamily="sans-serif-medium" />
 
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="@string/onboarding_seed_instruction_body"
-                        android:textSize="15sp"
-                        android:textColor="@color/color_text_secondary"
-                        android:lineHeight="20sp" />
-
                     <!-- Seed Input Grid -->
                     <androidx.gridlayout.widget.GridLayout
                         android:id="@+id/seed_input_grid"
@@ -384,17 +474,22 @@
                     <!-- Paste Button -->
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/paste_button"
-                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                         android:layout_width="wrap_content"
                         android:layout_height="44dp"
                         android:layout_gravity="center_horizontal"
                         android:layout_marginTop="16dp"
                         android:text="@string/onboarding_seed_paste_button"
                         android:textSize="14sp"
+                        android:textColor="#FFFFFF"
                         android:textAllCaps="false"
-                        app:strokeColor="@color/color_divider"
-                        app:strokeWidth="1dp"
-                        app:cornerRadius="22dp" />
+                        android:background="@drawable/bg_button_outlined_dark"
+                        app:backgroundTint="@null"
+                        app:cornerRadius="22dp"
+                        app:icon="@drawable/ic_copy"
+                        app:iconSize="18dp"
+                        app:iconTint="#FFFFFF"
+                        app:iconGravity="textStart"
+                        app:iconPadding="6dp" />
 
                     <!-- Validation Status -->
                     <LinearLayout
@@ -412,7 +507,7 @@
                             android:layout_width="18dp"
                             android:layout_height="18dp"
                             android:src="@drawable/ic_check"
-                            app:tint="@color/color_success_green" />
+                            app:tint="@color/numo_fluorescent_green" />
 
                         <TextView
                             android:id="@+id/seed_validation_text"
@@ -421,7 +516,7 @@
                             android:layout_marginStart="8dp"
                             android:text="@string/onboarding_seed_validation_ready"
                             android:textSize="14sp"
-                            android:textColor="@color/color_success_green" />
+                            android:textColor="@color/numo_fluorescent_green" />
 
                     </LinearLayout>
 
@@ -436,7 +531,7 @@
                 android:paddingHorizontal="20dp"
                 android:paddingTop="16dp"
                 android:paddingBottom="32dp"
-                android:background="@color/color_bg_light">
+                android:background="@color/numo_navy">
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/seed_continue_button"
@@ -444,12 +539,15 @@
                     android:layout_height="56dp"
                     android:text="@string/onboarding_seed_continue"
                     android:textSize="17sp"
-                    android:textColor="#FFFFFF"
+                    android:textColor="@color/button_text_onboarding"
                     android:textAllCaps="false"
                     android:enabled="false"
                     android:alpha="0.5"
+                    android:background="@drawable/bg_button_white"
+                    android:stateListAnimator="@null"
+                    app:backgroundTint="@null"
                     app:cornerRadius="28dp"
-                    app:backgroundTint="#000000" />
+                    app:elevation="0dp" />
 
             </LinearLayout>
         </LinearLayout>
@@ -475,7 +573,7 @@
                 android:layout_width="64dp"
                 android:layout_height="64dp"
                 android:indeterminate="true"
-                android:indeterminateTint="@color/color_text_primary" />
+                android:indeterminateTint="@color/numo_fluorescent_green" />
 
             <TextView
                 android:id="@+id/generating_status"
@@ -484,7 +582,7 @@
                 android:layout_marginTop="24dp"
                 android:text="@string/onboarding_status_creating_wallet"
                 android:textSize="17sp"
-                android:textColor="@color/color_text_primary"
+                android:textColor="#FFFFFF"
                 android:gravity="center" />
 
             <TextView
@@ -493,7 +591,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/onboarding_generating_hint"
                 android:textSize="14sp"
-                android:textColor="@color/color_text_secondary"
+                android:textColor="#99FFFFFF"
                 android:gravity="center" />
 
         </LinearLayout>
@@ -519,7 +617,7 @@
                 android:layout_width="64dp"
                 android:layout_height="64dp"
                 android:indeterminate="true"
-                android:indeterminateTint="@color/color_text_primary" />
+                android:indeterminateTint="@color/numo_fluorescent_green" />
 
             <TextView
                 android:id="@+id/fetching_status"
@@ -528,7 +626,7 @@
                 android:layout_marginTop="24dp"
                 android:text="@string/onboarding_fetching_searching_backup"
                 android:textSize="17sp"
-                android:textColor="@color/color_text_primary"
+                android:textColor="#FFFFFF"
                 android:gravity="center" />
 
             <TextView
@@ -537,7 +635,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/onboarding_fetching_checking_relays"
                 android:textSize="14sp"
-                android:textColor="@color/color_text_secondary"
+                android:textColor="#99FFFFFF"
                 android:gravity="center" />
 
         </LinearLayout>
@@ -557,177 +655,117 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <!-- Top Bar -->
+            <!-- Back button -->
+            <ImageView
+                android:id="@+id/mints_back_button"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:padding="12dp"
+                android:src="@drawable/ic_chevron_back"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                app:tint="#99FFFFFF"
+                android:contentDescription="@string/onboarding_mints_toolbar_back" />
+
+            <!-- Title -->
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="24dp"
+                android:paddingTop="8dp"
+                android:text="@string/onboarding_mints_toolbar_title"
+                android:textSize="32sp"
+                android:textColor="#FFFFFF"
+                android:fontFamily="sans-serif-black"
+                android:textAllCaps="true"
+                android:letterSpacing="-0.03"
+                android:lineSpacingMultiplier="1.05" />
+
+            <!-- Backup Status Card -->
             <LinearLayout
+                android:id="@+id/backup_status_card"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
                 android:orientation="horizontal"
+                android:background="@color/numo_navy"
+                android:padding="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginHorizontal="20dp"
                 android:gravity="center_vertical"
-                android:paddingHorizontal="8dp">
+                android:visibility="gone">
 
                 <ImageView
-                    android:id="@+id/mints_back_button"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:padding="12dp"
-                    android:src="@drawable/ic_arrow_back"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    app:tint="@color/color_text_primary"
-                    android:contentDescription="@string/onboarding_mints_toolbar_back" />
+                    android:id="@+id/backup_status_icon"
+                    android:layout_width="28dp"
+                    android:layout_height="28dp"
+                    android:src="@drawable/ic_cloud_done"
+                    app:tint="@color/numo_fluorescent_green" />
 
-                <TextView
+                <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="@string/onboarding_mints_toolbar_title"
-                    android:textSize="17sp"
-                    android:textColor="@color/color_text_primary"
-                    android:fontFamily="sans-serif-medium"
-                    android:gravity="center" />
-
-                <Space
-                    android:layout_width="48dp"
-                    android:layout_height="48dp" />
-
-            </LinearLayout>
-
-            <ScrollView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                android:fillViewport="true">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:paddingHorizontal="20dp"
-                    android:paddingBottom="24dp">
-
-                    <!-- Backup Status Card -->
-                    <LinearLayout
-                        android:id="@+id/backup_status_card"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:background="@drawable/bg_success_card"
-                        android:padding="16dp"
-                        android:layout_marginTop="8dp"
-                        android:gravity="center_vertical"
-                        android:visibility="gone">
+                    android:layout_marginStart="14dp">
 
-                        <ImageView
-                            android:id="@+id/backup_status_icon"
-                            android:layout_width="28dp"
-                            android:layout_height="28dp"
-                            android:src="@drawable/ic_cloud_done"
-                            app:tint="@color/color_success_green" />
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:orientation="vertical"
-                            android:layout_marginStart="14dp">
-
-                            <TextView
-                                android:id="@+id/backup_status_title"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/onboarding_backup_found_title"
-                                android:textSize="15sp"
-                                android:textColor="@color/color_success_green"
-                                android:fontFamily="sans-serif-medium" />
-
-                            <TextView
-                                android:id="@+id/backup_status_subtitle"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="2dp"
-                                android:text="@string/onboarding_backup_found_subtitle"
-                                android:textSize="13sp"
-                                android:textColor="@color/color_text_secondary" />
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                    <!-- Title -->
                     <TextView
-                        android:layout_width="match_parent"
+                        android:id="@+id/backup_status_title"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:text="@string/onboarding_mints_title"
-                        android:textSize="22sp"
-                        android:textColor="@color/color_text_primary"
+                        android:text="@string/onboarding_backup_found_title"
+                        android:textSize="15sp"
+                        android:textColor="@color/numo_fluorescent_green"
                         android:fontFamily="sans-serif-medium" />
 
                     <TextView
-                        android:id="@+id/mints_subtitle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
-                        android:text="@string/onboarding_mints_subtitle_description"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary" />
-
-                    <!-- Mints List -->
-                    <LinearLayout
-                        android:id="@+id/mints_list_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:layout_marginTop="16dp" />
-
-                    <!-- Mints Count -->
-                    <TextView
-                        android:id="@+id/mints_count_text"
+                        android:id="@+id/backup_status_subtitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="@string/onboarding_mints_count"
+                        android:layout_marginTop="2dp"
+                        android:text="@string/onboarding_backup_found_subtitle"
                         android:textSize="13sp"
-                        android:textColor="@color/color_text_tertiary" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="24dp"
-                        android:text="@string/mints_add_section"
-                        android:textSize="12sp"
-                        android:letterSpacing="0.08"
-                        android:fontFamily="sans-serif-medium"
-                        android:textColor="@color/color_text_tertiary" />
-
-                    <com.electricdreams.numo.ui.components.AddMintInputCard
-                        android:id="@+id/add_different_mint_card"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp" />
+                        android:textColor="#99FFFFFF" />
 
                 </LinearLayout>
-            </ScrollView>
 
-            <!-- Continue Button - Fixed at bottom -->
+            </LinearLayout>
+
+            <!-- Mints RecyclerView -->
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/mints_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="12dp"
+                android:paddingBottom="8dp"
+                android:clipToPadding="false" />
+
+            <!-- Fixed Bottom Buttons -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:paddingHorizontal="20dp"
-                android:paddingTop="16dp"
+                android:paddingTop="12dp"
                 android:paddingBottom="32dp"
-                android:background="@color/color_bg_light">
+                android:background="@color/numo_navy">
 
+                <!-- Continue - primary button (matches seed_continue_button style) -->
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/mints_continue_button"
                     android:layout_width="match_parent"
                     android:layout_height="56dp"
                     android:text="@string/onboarding_mints_continue_new_wallet"
                     android:textSize="17sp"
-                    android:textColor="#FFFFFF"
+                    android:textColor="@color/button_text_onboarding"
                     android:textAllCaps="false"
+                    android:background="@drawable/bg_button_white"
+                    android:stateListAnimator="@null"
+                    app:backgroundTint="@null"
                     app:cornerRadius="28dp"
-                    app:backgroundTint="#000000" />
+                    app:elevation="0dp" />
 
             </LinearLayout>
         </LinearLayout>
@@ -760,7 +798,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/onboarding_restoring_title"
                     android:textSize="17sp"
-                    android:textColor="@color/color_text_primary"
+                    android:textColor="#FFFFFF"
                     android:fontFamily="sans-serif-medium"
                     android:gravity="center" />
 
@@ -785,7 +823,7 @@
                         android:layout_width="48dp"
                         android:layout_height="48dp"
                         android:indeterminate="true"
-                        android:indeterminateTint="@color/color_text_primary" />
+                        android:indeterminateTint="@color/numo_fluorescent_green" />
 
                     <TextView
                         android:id="@+id/restoring_status"
@@ -794,7 +832,7 @@
                         android:layout_marginTop="16dp"
                         android:text="@string/onboarding_restoring_initializing"
                         android:textSize="15sp"
-                        android:textColor="@color/color_text_secondary"
+                        android:textColor="#99FFFFFF"
                         android:gravity="center" />
 
                     <!-- Mint Progress Items -->
@@ -854,7 +892,7 @@
                 android:layout_marginTop="32dp"
                 android:text="@string/onboarding_success_created_title"
                 android:textSize="28sp"
-                android:textColor="@color/color_text_primary"
+                android:textColor="#FFFFFF"
                 android:fontFamily="sans-serif-medium"
                 android:gravity="center" />
 
@@ -865,7 +903,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/onboarding_success_created_subtitle"
                 android:textSize="16sp"
-                android:textColor="@color/color_text_secondary"
+                android:textColor="#99FFFFFF"
                 android:gravity="center" />
 
             <Space
@@ -886,7 +924,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/onboarding_success_balance_by_mint"
                     android:textSize="12sp"
-                    android:textColor="@color/color_text_tertiary"
+                    android:textColor="#73FFFFFF"
                     android:letterSpacing="0.1"
                     android:layout_marginBottom="12dp" />
 
@@ -910,10 +948,13 @@
                 android:layout_height="56dp"
                 android:text="@string/onboarding_enter_wallet_button"
                 android:textSize="17sp"
-                android:textColor="#FFFFFF"
+                android:textColor="@color/button_text_onboarding"
                 android:textAllCaps="false"
+                android:background="@drawable/bg_button_white"
+                android:stateListAnimator="@null"
+                app:backgroundTint="@null"
                 app:cornerRadius="28dp"
-                app:backgroundTint="#000000" />
+                app:elevation="0dp" />
 
             <Space
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_security_settings.xml b/app/src/main/res/layout/activity_security_settings.xml
index 03ad7d6e..77cbc08d 100644
--- a/app/src/main/res/layout/activity_security_settings.xml
+++ b/app/src/main/res/layout/activity_security_settings.xml
@@ -16,12 +16,10 @@
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="48dp"
-            android:minHeight="48dp"
-            android:padding="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/common_back"
             android:src="@drawable/ic_chevron_back"
             android:tint="@color/color_text_primary"
@@ -49,6 +47,7 @@
         app:layout_constraintTop_toBottomOf="@id/top_bar">
 
         <LinearLayout
+            android:id="@+id/security_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -61,22 +60,18 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
+                android:paddingHorizontal="20dp"
                 android:paddingTop="16dp"
-                android:paddingBottom="8dp"
+                android:paddingBottom="14dp"
                 android:text="Wallet Backup"
-                android:textSize="13sp"
-                android:textColor="@color/color_text_secondary"
-                android:fontFamily="sans-serif-medium"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <!-- Security Info Card -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_marginHorizontal="24dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="8dp"
                 android:padding="20dp"
                 android:background="@drawable/bg_warning_card">
@@ -118,18 +113,19 @@
             <LinearLayout
                 android:id="@+id/backup_mnemonic_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_key"
                     app:tint="@color/color_icon_secondary" />
 
@@ -143,87 +139,21 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_backup_mnemonic_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_text_primary"
-                        android:fontFamily="sans-serif-medium" />
+                        android:textAppearance="@style/Text.RowTitle" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_backup_mnemonic_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
-                        android:layout_marginTop="2dp" />
-                </LinearLayout>
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
-            </LinearLayout>
-
-            <!-- Wallet Recovery Section -->
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
-                android:paddingTop="24dp"
-                android:paddingBottom="8dp"
-                android:text="@string/security_settings_section_recovery"
-                android:textSize="13sp"
-                android:textColor="@color/color_text_secondary"
-                android:fontFamily="sans-serif-medium"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
-
-            <!-- Restore Wallet Item -->
-            <LinearLayout
-                android:id="@+id/restore_wallet_item"
-                android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
-                    android:src="@drawable/ic_restore"
-                    app:tint="@color/color_icon_secondary" />
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/security_settings_restore_wallet_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_text_primary"
-                        android:fontFamily="sans-serif-medium" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/security_settings_restore_wallet_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
+                        android:textAppearance="@style/Text.RowSubtitle"
                         android:layout_marginTop="2dp" />
                 </LinearLayout>
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
             </LinearLayout>
 
             <!-- ===================== -->
@@ -233,22 +163,18 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
-                android:paddingTop="32dp"
-                android:paddingBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/security_settings_section_pin_protection"
-                android:textSize="13sp"
-                android:textColor="@color/color_text_secondary"
-                android:fontFamily="sans-serif-medium"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <!-- PIN Info Card -->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_marginHorizontal="24dp"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginBottom="8dp"
                 android:padding="16dp"
                 android:background="@drawable/bg_pin_info_card">
@@ -290,18 +216,19 @@
             <LinearLayout
                 android:id="@+id/setup_pin_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_lock"
                     app:tint="@color/color_icon_secondary" />
 
@@ -316,44 +243,42 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_setup_pin_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_text_primary"
-                        android:fontFamily="sans-serif-medium" />
+                        android:textAppearance="@style/Text.RowTitle" />
 
                     <TextView
                         android:id="@+id/pin_subtitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_setup_pin_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
+                        android:textAppearance="@style/Text.RowSubtitle"
                         android:layout_marginTop="2dp" />
                 </LinearLayout>
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
             </LinearLayout>
 
             <!-- Change PIN Item (shown when PIN is set) -->
             <LinearLayout
                 android:id="@+id/change_pin_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp"
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp"
                 android:visibility="gone">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_edit"
                     app:tint="@color/color_icon_secondary" />
 
@@ -367,43 +292,41 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_change_pin_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_text_primary"
-                        android:fontFamily="sans-serif-medium" />
+                        android:textAppearance="@style/Text.RowTitle" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_change_pin_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
+                        android:textAppearance="@style/Text.RowSubtitle"
                         android:layout_marginTop="2dp" />
                 </LinearLayout>
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
             </LinearLayout>
 
             <!-- Remove PIN Item (shown when PIN is set) -->
             <LinearLayout
                 android:id="@+id/remove_pin_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp"
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp"
                 android:visibility="gone">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_close"
                     app:tint="@color/color_warning_red" />
 
@@ -417,24 +340,83 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_remove_pin_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_warning_red"
-                        android:fontFamily="sans-serif-medium" />
+                        android:textAppearance="@style/Text.RowTitle"
+                        android:textColor="@color/color_warning_red" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_remove_pin_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
+                        android:textAppearance="@style/Text.RowSubtitle"
                         android:layout_marginTop="2dp" />
                 </LinearLayout>
 
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@drawable/ic_chevron_forward"
+                    app:tint="@color/color_text_tertiary" />
+            </LinearLayout>
+
+            <!-- ======================== -->
+            <!-- WALLET RECOVERY SECTION -->
+            <!-- ======================== -->
+
+            <!-- Wallet Recovery Section -->
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
+                android:text="@string/security_settings_section_recovery"
+                android:textAppearance="@style/Text.SectionHeader" />
+
+            <!-- Restore Wallet Item -->
+            <LinearLayout
+                android:id="@+id/restore_wallet_item"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
+                android:clickable="true"
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
+
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:src="@drawable/ic_chevron_forward"
+                    android:layout_marginEnd="14dp"
+                    android:src="@drawable/ic_restore"
                     app:tint="@color/color_icon_secondary" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/security_settings_restore_wallet_title"
+                        android:textAppearance="@style/Text.RowTitle" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/security_settings_restore_wallet_subtitle"
+                        android:textAppearance="@style/Text.RowSubtitle"
+                        android:layout_marginTop="2dp" />
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:src="@drawable/ic_chevron_forward"
+                    app:tint="@color/color_text_tertiary" />
             </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2b001973..44f9dead 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -16,12 +16,10 @@
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="48dp"
-            android:minHeight="48dp"
-            android:padding="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/common_back"
             android:src="@drawable/ic_close"
             android:tint="@color/color_text_primary"
@@ -48,6 +46,7 @@
         app:layout_constraintTop_toBottomOf="@id/top_bar">
 
         <LinearLayout
+            android:id="@+id/settings_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -60,161 +59,115 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
+                android:paddingHorizontal="20dp"
                 android:paddingTop="16dp"
-                android:paddingBottom="8dp"
+                android:paddingBottom="14dp"
                 android:text="@string/settings_section_terminal"
-                android:textSize="13sp"
-                android:textColor="@color/color_text_secondary"
-                android:fontFamily="sans-serif-medium"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <!-- Items -->
             <LinearLayout
                 android:id="@+id/items_settings_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_catalog"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
                     android:text="@string/settings_item_items_title"
-                    android:textSize="17sp"
-                    android:textColor="@color/color_text_primary"
-                    android:fontFamily="sans-serif-medium" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_item_items_subtitle"
-                    android:textSize="14sp"
-                    android:textColor="@color/color_text_secondary"
-                    android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- Tips -->
             <LinearLayout
                 android:id="@+id/tips_settings_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_tip"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
                     android:text="@string/settings_item_tips_title"
-                    android:textSize="17sp"
-                    android:textColor="@color/color_text_primary"
-                    android:fontFamily="sans-serif-medium" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_item_tips_subtitle"
-                    android:textSize="14sp"
-                    android:textColor="@color/color_text_secondary"
-                    android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- Basket Names -->
             <LinearLayout
                 android:id="@+id/basket_names_settings_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_shopping_bag"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_basket_names_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_text_primary"
-                        android:fontFamily="sans-serif-medium" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_basket_names_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
-                        android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:text="@string/settings_item_basket_names_title"
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- ================= -->
@@ -224,210 +177,150 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
-                android:paddingTop="24dp"
-                android:paddingBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/settings_section_payments"
-                android:textSize="13sp"
-                android:textColor="@color/color_text_secondary"
-                android:fontFamily="sans-serif-medium"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <!-- Fiat Currency -->
             <LinearLayout
                 android:id="@+id/currency_settings_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_switch_currency"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
                     android:text="@string/settings_item_currency_title"
-                    android:textSize="17sp"
-                    android:textColor="@color/color_text_primary"
-                    android:fontFamily="sans-serif-medium" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_item_currency_subtitle"
-                    android:textSize="14sp"
-                    android:textColor="@color/color_text_secondary"
-                    android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- Mints -->
             <LinearLayout
                 android:id="@+id/mints_settings_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_bank"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_mints_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_text_primary"
-                        android:fontFamily="sans-serif-medium" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_mints_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
-                        android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:text="@string/settings_item_mints_title"
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- Webhooks -->
             <LinearLayout
                 android:id="@+id/webhooks_settings_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_link"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_webhooks_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_text_primary"
-                        android:fontFamily="sans-serif-medium" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_webhooks_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
-                        android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:text="@string/settings_item_webhooks_title"
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- Withdrawals -->
             <LinearLayout
                 android:id="@+id/withdrawals_settings_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_lightning_bolt"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_withdrawals_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_text_primary"
-                        android:fontFamily="sans-serif-medium" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_withdrawals_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
-                        android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:text="@string/settings_item_withdrawals_title"
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- =========================== -->
@@ -436,63 +329,46 @@
 
             <TextView
                 android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="24dp"
-            android:paddingTop="24dp"
-            android:paddingBottom="8dp"
-            android:text="@string/settings_section_security"
-            android:textSize="13sp"
-            android:textColor="@color/color_text_secondary"
-            android:fontFamily="sans-serif-medium"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
+                android:text="@string/settings_section_security"
+                android:textAppearance="@style/Text.SectionHeader" />
 
+            <!-- Security -->
             <LinearLayout
                 android:id="@+id/security_settings_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_shield"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
                     android:text="@string/settings_item_security_title"
-                    android:textSize="17sp"
-                    android:textColor="@color/color_text_primary"
-                    android:fontFamily="sans-serif-medium" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_item_security_subtitle"
-                    android:textSize="14sp"
-                    android:textColor="@color/color_text_secondary"
-                    android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- =============== -->
@@ -502,161 +378,115 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
-                android:paddingTop="24dp"
-                android:paddingBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/settings_section_general"
-                android:textSize="13sp"
-                android:textColor="@color/color_text_secondary"
-                android:fontFamily="sans-serif-medium"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <!-- Language -->
             <LinearLayout
                 android:id="@+id/language_settings_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_language"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_language_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_text_primary"
-                        android:fontFamily="sans-serif-medium" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_language_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
-                        android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:text="@string/settings_item_language_title"
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- Theme -->
             <LinearLayout
                 android:id="@+id/theme_settings_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_dark_mode"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
                     android:text="@string/settings_item_theme_title"
-                    android:textSize="17sp"
-                    android:textColor="@color/color_text_primary"
-                    android:fontFamily="sans-serif-medium" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/settings_item_theme_subtitle"
-                    android:textSize="14sp"
-                    android:textColor="@color/color_text_secondary"
-                    android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- About -->
             <LinearLayout
                 android:id="@+id/about_item"
                 android:layout_width="match_parent"
-                android:layout_height="72dp"
-                android:background="?attr/selectableItemBackground"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_info"
                     app:tint="@color/color_icon_secondary" />
 
-                <LinearLayout
+                <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_about_title"
-                        android:textSize="17sp"
-                        android:textColor="@color/color_text_primary"
-                        android:fontFamily="sans-serif-medium" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/settings_item_about_subtitle"
-                        android:textSize="14sp"
-                        android:textColor="@color/color_text_secondary"
-                        android:layout_marginTop="2dp" />
-                </LinearLayout>
+                    android:text="@string/settings_item_about_title"
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
                     android:src="@drawable/ic_chevron_forward"
-                    app:tint="@color/color_icon_secondary" />
+                    app:tint="@color/color_text_tertiary" />
+
             </LinearLayout>
 
             <!-- ==================== -->
@@ -673,62 +503,44 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingHorizontal="24dp"
-                    android:paddingTop="24dp"
-                    android:paddingBottom="8dp"
+                    android:paddingHorizontal="20dp"
+                    android:paddingTop="28dp"
+                    android:paddingBottom="14dp"
                     android:text="@string/settings_section_developer"
-                    android:textSize="13sp"
-                    android:textColor="@color/color_text_secondary"
-                    android:fontFamily="sans-serif-medium"
-                    android:textAllCaps="true"
-                    android:letterSpacing="0.05" />
+                    android:textAppearance="@style/Text.SectionHeader" />
 
                 <LinearLayout
                     android:id="@+id/developer_settings_item"
                     android:layout_width="match_parent"
-                    android:layout_height="72dp"
-                    android:background="?attr/selectableItemBackground"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_row_ripple"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="24dp">
+                    android:paddingVertical="14dp"
+                    android:paddingHorizontal="20dp">
 
                     <ImageView
                         android:layout_width="24dp"
                         android:layout_height="24dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginEnd="14dp"
                         android:src="@drawable/ic_settings"
                         app:tint="@color/color_icon_secondary" />
 
-                    <LinearLayout
+                    <TextView
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/settings_item_developer_title"
-                            android:textSize="17sp"
-                            android:textColor="@color/color_text_primary"
-                            android:fontFamily="sans-serif-medium" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/settings_item_developer_subtitle"
-                            android:textSize="14sp"
-                            android:textColor="@color/color_text_secondary"
-                            android:layout_marginTop="2dp" />
-                    </LinearLayout>
+                        android:text="@string/settings_item_developer_title"
+                        android:textAppearance="@style/Text.RowTitle" />
 
                     <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="20dp"
+                        android:layout_height="20dp"
                         android:src="@drawable/ic_chevron_forward"
-                        app:tint="@color/color_icon_secondary" />
+                        app:tint="@color/color_text_tertiary" />
+
                 </LinearLayout>
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/activity_theme_settings.xml b/app/src/main/res/layout/activity_theme_settings.xml
index f9997e07..e8cfd47a 100644
--- a/app/src/main/res/layout/activity_theme_settings.xml
+++ b/app/src/main/res/layout/activity_theme_settings.xml
@@ -16,12 +16,10 @@
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="48dp"
-            android:minHeight="48dp"
-            android:padding="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/common_back"
             android:src="@drawable/ic_chevron_back"
             android:tint="@color/color_text_primary"
@@ -48,6 +46,7 @@
         app:layout_constraintTop_toBottomOf="@id/top_bar">
 
         <LinearLayout
+            android:id="@+id/theme_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -56,44 +55,47 @@
             <!-- Mode Section Header -->
             <TextView
                 android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginBottom="4dp"
-            android:text="@string/theme_settings_section_mode"
-            android:textAppearance="@style/Text.SectionHeader" />
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="14dp"
+                android:text="@string/theme_settings_section_mode"
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <!-- Dark Mode Toggle -->
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
-                android:paddingHorizontal="24dp"
-                android:layout_marginBottom="16dp">
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp"
+                android:background="@drawable/bg_row_ripple">
 
                 <TextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="@string/theme_settings_dark_mode_label"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/dark_mode_switch"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    app:thumbTint="@color/selector_switch_thumb"
+                    app:trackTint="@color/selector_switch_track" />
             </LinearLayout>
 
             <!-- App Theme Section Header -->
             <TextView
                 android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="24dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="4dp"
-            android:text="@string/theme_settings_section_app_theme"
-            android:textAppearance="@style/Text.SectionHeader" />
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
+                android:text="@string/theme_settings_section_app_theme"
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <!-- Theme Radio Group -->
             <RadioGroup
@@ -107,12 +109,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/theme_settings_option_obsidian"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_bitcoin_orange"
@@ -120,12 +121,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/theme_settings_option_bitcoin_orange"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_green"
@@ -133,12 +133,11 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/theme_settings_option_green"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
 
                 <RadioButton
                     android:id="@+id/radio_white"
@@ -146,16 +145,14 @@
                     android:layout_height="56dp"
                     android:background="?attr/selectableItemBackground"
                     android:button="@null"
-                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
-                    android:drawableTint="@color/color_primary_green"
+                    android:drawableEnd="@drawable/selector_radio_custom"
                     android:gravity="center_vertical"
-                    android:paddingHorizontal="24dp"
+                    android:paddingHorizontal="20dp"
                     android:text="@string/theme_settings_option_white"
-                    android:textAppearance="@style/Text.BodyBold" />
+                    android:textAppearance="@style/Text.RowTitle" />
             </RadioGroup>
 
         </LinearLayout>
     </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
-
diff --git a/app/src/main/res/layout/activity_tip_selection.xml b/app/src/main/res/layout/activity_tip_selection.xml
index be019914..8a6d64b2 100644
--- a/app/src/main/res/layout/activity_tip_selection.xml
+++ b/app/src/main/res/layout/activity_tip_selection.xml
@@ -247,16 +247,12 @@
         <!-- Confirm Button - hidden initially, appears with animation -->
         <Button
             android:id="@+id/custom_confirm_button"
+            style="@style/Widget.Button.Primary.Green"
             android:layout_width="0dp"
             android:layout_height="52dp"
             android:layout_weight="0"
             android:layout_marginStart="0dp"
             android:text="@string/tip_selection_main_confirm"
-            android:textAllCaps="false"
-            android:textColor="@color/color_bg_white"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            android:background="@drawable/bg_button_primary_green"
             android:visibility="gone" />
 
     </LinearLayout>
@@ -264,18 +260,13 @@
     <!-- Main Confirm Button (bottom, for preset selections) -->
     <Button
         android:id="@+id/confirm_button"
+        style="@style/Widget.Button.Primary.Green"
         android:layout_width="match_parent"
         android:layout_height="52dp"
-        android:layout_marginHorizontal="24dp"
+        android:layout_marginHorizontal="20dp"
         android:layout_marginBottom="24dp"
         android:text="@string/tip_selection_main_confirm"
-        android:textAllCaps="false"
-        android:textColor="@color/color_bg_white"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        android:background="@drawable/bg_button_primary_green"
         android:enabled="false"
-        android:alpha="0.4"
         app:layout_constraintBottom_toBottomOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_tips_settings.xml b/app/src/main/res/layout/activity_tips_settings.xml
index 20dfd461..e2d60a44 100644
--- a/app/src/main/res/layout/activity_tips_settings.xml
+++ b/app/src/main/res/layout/activity_tips_settings.xml
@@ -96,7 +96,9 @@
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/tips_enabled_switch"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    app:thumbTint="@color/selector_switch_thumb"
+                    app:trackTint="@color/selector_switch_track" />
             </LinearLayout>
 
             <!-- Presets Section -->
diff --git a/app/src/main/res/layout/activity_webhook_settings.xml b/app/src/main/res/layout/activity_webhook_settings.xml
index 0ec805b6..9956bd13 100644
--- a/app/src/main/res/layout/activity_webhook_settings.xml
+++ b/app/src/main/res/layout/activity_webhook_settings.xml
@@ -15,12 +15,10 @@
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="48dp"
-            android:minHeight="48dp"
-            android:padding="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/common_back"
             android:src="@drawable/ic_chevron_back"
             android:tint="@color/color_text_primary"
@@ -55,34 +53,26 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
+                android:paddingHorizontal="20dp"
                 android:paddingTop="16dp"
                 android:paddingBottom="8dp"
                 android:text="@string/webhook_settings_description"
-                android:textSize="14sp"
-                android:textColor="@color/color_text_secondary"
-                android:lineSpacingExtra="2dp" />
+                android:textAppearance="@style/Text.Helper" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
-                android:paddingTop="20dp"
-                android:paddingBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="16dp"
+                android:paddingBottom="14dp"
                 android:text="@string/webhook_settings_section_endpoints"
-                android:textSize="13sp"
-                android:textColor="@color/color_text_secondary"
-                android:fontFamily="sans-serif-medium"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <LinearLayout
-                android:id="@+id/endpoints_card"
+                android:id="@+id/endpoints_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
-                android:orientation="vertical"
-                android:background="@drawable/bg_rounded_card_large">
+                android:orientation="vertical">
 
                 <LinearLayout
                     android:id="@+id/endpoints_list"
@@ -90,86 +80,54 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical" />
 
-                <TextView
+                <include
                     android:id="@+id/empty_state_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:paddingHorizontal="20dp"
-                    android:paddingVertical="24dp"
-                    android:text="@string/webhook_settings_empty"
-                    android:textColor="@color/color_text_tertiary"
-                    android:textSize="14sp" />
+                    layout="@layout/component_empty_state" />
             </LinearLayout>
 
-            <LinearLayout
+            <Button
                 android:id="@+id/add_endpoint_button"
+                style="@style/Widget.Button.Secondary.Outlined"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20dp"
                 android:layout_marginTop="8dp"
-                android:layout_marginHorizontal="16dp"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:paddingHorizontal="16dp"
-                android:background="@drawable/bg_rounded_card_large"
-                android:clickable="true"
-                android:focusable="true">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
-                    android:src="@drawable/ic_add"
-                    app:tint="@color/color_primary_green" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/webhook_settings_add_endpoint"
-                    android:textSize="16sp"
-                    android:textColor="@color/color_primary_green"
-                    android:fontFamily="sans-serif-medium" />
-            </LinearLayout>
+                android:text="+ Add Endpoint"
+                android:gravity="center" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="24dp"
-                android:paddingTop="32dp"
-                android:paddingBottom="8dp"
+                android:paddingHorizontal="20dp"
+                android:paddingTop="28dp"
+                android:paddingBottom="14dp"
                 android:text="@string/webhook_settings_section_actions"
-                android:textSize="13sp"
-                android:textColor="@color/color_text_secondary"
-                android:fontFamily="sans-serif-medium"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
+                android:textAppearance="@style/Text.SectionHeader" />
 
             <LinearLayout
                 android:id="@+id/sync_all_button"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
-                android:layout_marginHorizontal="16dp"
-                android:orientation="horizontal"
-                android:gravity="center_vertical"
-                android:paddingHorizontal="16dp"
-                android:background="@drawable/bg_rounded_card_large"
+                android:layout_height="wrap_content"
+                android:background="@drawable/bg_row_ripple"
                 android:clickable="true"
-                android:focusable="true">
+                android:focusable="true"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:paddingVertical="14dp"
+                android:paddingHorizontal="20dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_marginEnd="14dp"
                     android:src="@drawable/ic_refresh"
-                    app:tint="@color/color_text_primary" />
+                    app:tint="@color/color_icon_secondary" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/webhook_settings_sync_all"
-                    android:textSize="16sp"
-                    android:textColor="@color/color_text_primary"
-                    android:fontFamily="sans-serif-medium" />
+                    android:text="Sync All Endpoints"
+                    android:textAppearance="@style/Text.RowTitle" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/activity_withdraw_lightning.xml b/app/src/main/res/layout/activity_withdraw_lightning.xml
index 4ad7e785..80f8944c 100644
--- a/app/src/main/res/layout/activity_withdraw_lightning.xml
+++ b/app/src/main/res/layout/activity_withdraw_lightning.xml
@@ -12,18 +12,15 @@
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:background="@color/color_bg_white"
-        android:elevation="1dp"
-        android:paddingHorizontal="8dp"
+        android:paddingHorizontal="16dp"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="48dp"
-            android:minHeight="48dp"
-            android:padding="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/withdraw_lightning_toolbar_back"
             android:src="@drawable/ic_chevron_back"
             app:tint="@color/color_text_primary"
@@ -35,10 +32,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/withdraw_lightning_title"
-            android:textSize="20sp"
-            android:fontFamily="sans-serif-medium"
-            android:textColor="@color/color_text_primary"
-            android:textAlignment="center"
+            android:textAppearance="@style/Text.Title"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -52,7 +46,6 @@
         android:fillViewport="true"
         android:clipToPadding="false"
         android:clipChildren="false"
-        android:background="@color/color_bg_surface"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/top_bar">
 
@@ -71,7 +64,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="20dp"
                 android:layout_marginTop="20dp"
-                app:cardBackgroundColor="@color/color_bg_card"
+                app:cardBackgroundColor="@android:color/transparent"
                 app:cardCornerRadius="16dp"
                 app:cardElevation="0dp"
                 app:strokeWidth="0dp">
@@ -79,6 +72,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@drawable/bg_hero_gradient"
                     android:gravity="center"
                     android:orientation="vertical"
                     android:padding="24dp">
@@ -104,6 +98,14 @@
                         android:textSize="40sp"
                         android:textStyle="bold" />
 
+                    <TextView
+                        android:id="@+id/fiat_balance_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:textColor="@color/color_text_secondary"
+                        android:textSize="16sp" />
+
                     <TextView
                         android:id="@+id/mint_name_text"
                         android:layout_width="wrap_content"
@@ -112,10 +114,7 @@
                         android:text="@string/withdraw_lightning_mint_name_label"
                         android:textAppearance="@style/Text.Caption"
                         android:textColor="@color/color_text_tertiary"
-                        android:textSize="13sp"
-                        android:drawableStart="@drawable/ic_lightning_bolt"
-                        android:drawablePadding="6dp"
-                        android:drawableTint="@color/color_text_tertiary" />
+                        android:textSize="13sp" />
 
                 </LinearLayout>
 
@@ -124,37 +123,39 @@
             <!-- Tabs -->
             <LinearLayout
                 android:id="@+id/tabs_container"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginHorizontal="20dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
                 android:layout_marginTop="24dp"
-                android:background="@drawable/bg_input_pill"
-                android:padding="4dp"
+                android:background="@drawable/bg_button_secondary_pill"
+                android:padding="5dp"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/tab_lightning"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@drawable/bg_segment_tab_selected"
+                    android:layout_width="wrap_content"
+                    android:layout_height="42dp"
+                    android:minWidth="125dp"
                     android:gravity="center"
+                    android:paddingHorizontal="21dp"
                     android:text="@string/withdraw_tab_lightning"
-                    android:textColor="@color/color_text_primary"
-                    android:textSize="14sp"
-                    android:fontFamily="sans-serif-medium" />
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    android:textColor="@color/color_bg_white"
+                    android:background="@drawable/bg_button_primary_green" />
 
                 <TextView
                     android:id="@+id/tab_cashu"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@null"
+                    android:layout_width="wrap_content"
+                    android:layout_height="42dp"
+                    android:minWidth="125dp"
                     android:gravity="center"
+                    android:paddingHorizontal="21dp"
                     android:text="@string/withdraw_tab_cashu"
-                    android:textColor="@color/color_text_tertiary"
-                    android:textSize="14sp"
-                    android:fontFamily="sans-serif-medium" />
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    android:textColor="@color/color_text_secondary"
+                    android:background="@android:color/transparent" />
 
             </LinearLayout>
 
@@ -167,17 +168,13 @@
 
                 <!-- Section Header -->
                 <TextView
+                    style="@style/Text.SectionHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="24dp"
                     android:layout_marginTop="28dp"
                     android:layout_marginBottom="12dp"
-                    android:text="@string/withdraw_section_send_to"
-                    android:fontFamily="sans-serif"
-                    android:textSize="13sp"
-                    android:textColor="@color/color_text_secondary"
-                    android:textAllCaps="true"
-                    android:letterSpacing="0.03" />
+                    android:text="@string/auto_withdraw_section_destination" />
 
                 <!-- Invoice Card -->
                 <com.electricdreams.numo.ui.components.WithdrawInvoiceCard
@@ -239,17 +236,13 @@
 
                 <!-- Section Header -->
                 <TextView
+                    style="@style/Text.SectionHeader"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="24dp"
                     android:layout_marginTop="28dp"
                     android:layout_marginBottom="12dp"
-                    android:text="@string/withdraw_tab_cashu"
-                    android:fontFamily="sans-serif"
-                    android:textSize="13sp"
-                    android:textColor="@color/color_text_secondary"
-                    android:textAllCaps="true"
-                    android:letterSpacing="0.03" />
+                    android:text="@string/withdraw_tab_cashu" />
 
                 <!-- Amount Input Card -->
                 <com.google.android.material.card.MaterialCardView
@@ -257,8 +250,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="20dp"
-                    android:layout_marginTop="20dp"
-                    app:cardBackgroundColor="@color/color_bg_card"
+                    app:cardBackgroundColor="@android:color/transparent"
                     app:cardCornerRadius="16dp"
                     app:cardElevation="0dp"
                     app:strokeWidth="0dp">
@@ -269,63 +261,15 @@
                         android:orientation="vertical"
                         android:padding="20dp">
 
-                        <!-- Header -->
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal">
-
-                            <FrameLayout
-                                android:layout_width="48dp"
-                                android:layout_height="48dp"
-                                android:background="@drawable/bg_circle_accent_light">
-
-                                <ImageView
-                                    android:layout_width="24dp"
-                                    android:layout_height="24dp"
-                                    android:layout_gravity="center"
-                                    android:src="@drawable/ic_qr_scan"
-                                    app:tint="@color/color_primary" />
-                            </FrameLayout>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:layout_marginStart="16dp"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="@string/withdraw_cashu_amount_card_title"
-                                    android:textColor="@color/color_text_primary"
-                                    android:fontFamily="sans-serif-medium"
-                                    android:textSize="17sp" />
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="2dp"
-                                    android:text="@string/withdraw_cashu_amount_card_subtitle"
-                                    android:textAppearance="@style/Text.Caption"
-                                    android:textColor="@color/color_text_secondary"
-                                    android:textSize="13sp" />
-                            </LinearLayout>
-                        </LinearLayout>
-
-                        <!-- Amount Input -->
+                        <!-- Amount Label -->
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="20dp"
+                            android:layout_marginBottom="12dp"
+                            android:fontFamily="sans-serif-medium"
                             android:text="@string/withdraw_lightning_amount_label"
-                            android:textAppearance="@style/Text.Caption"
-                            android:textColor="@color/color_text_secondary"
-                            android:textSize="12sp"
-                            android:textAllCaps="true"
-                            android:letterSpacing="0.05" />
+                            android:textColor="@color/color_text_primary"
+                            android:textSize="15sp" />
 
                         <EditText
                             android:id="@+id/cashu_amount_input"
@@ -352,9 +296,7 @@
                             android:text="@string/withdraw_cashu_create_button"
                             android:textAllCaps="false"
                             android:textSize="17sp"
-                            android:textStyle="bold"
-                            android:enabled="false"
-                            android:alpha="0.5"/>
+                            android:enabled="false" />
 
                     </LinearLayout>
                 </com.google.android.material.card.MaterialCardView>
@@ -367,7 +309,7 @@
                     android:layout_marginHorizontal="20dp"
                     android:layout_marginTop="20dp"
                     android:layout_marginBottom="24dp"
-                    app:cardBackgroundColor="@color/color_bg_card"
+                    app:cardBackgroundColor="@android:color/transparent"
                     app:cardCornerRadius="16dp"
                     app:cardElevation="0dp"
                     app:strokeWidth="0dp"
diff --git a/app/src/main/res/layout/activity_withdraw_melt_quote.xml b/app/src/main/res/layout/activity_withdraw_melt_quote.xml
index 4df25a43..e2bd9142 100644
--- a/app/src/main/res/layout/activity_withdraw_melt_quote.xml
+++ b/app/src/main/res/layout/activity_withdraw_melt_quote.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_bg_surface">
+    android:background="@color/color_bg_white">
 
     <!-- Top App Bar -->
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -11,18 +11,15 @@
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:background="@color/color_bg_white"
-        android:elevation="1dp"
-        android:paddingHorizontal="8dp"
+        android:paddingHorizontal="16dp"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageButton
             android:id="@+id/back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:minWidth="48dp"
-            android:minHeight="48dp"
-            android:padding="12dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:padding="9dp"
+            android:background="@drawable/bg_nav_back_button"
             android:contentDescription="@string/withdraw_melt_toolbar_back"
             android:src="@drawable/ic_chevron_back"
             android:tint="@color/color_text_primary"
@@ -34,10 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/withdraw_melt_title"
-            android:textSize="20sp"
-            android:fontFamily="sans-serif-medium"
-            android:textColor="@color/color_text_primary"
-            android:textAlignment="center"
+            android:textAppearance="@style/Text.Title"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -49,7 +43,6 @@
         android:id="@+id/confirmation_scroll"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:background="@color/color_bg_surface"
         app:layout_constraintBottom_toTopOf="@id/confirm_button"
         app:layout_constraintTop_toBottomOf="@id/top_bar">
 
@@ -78,7 +71,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="20dp"
                 android:layout_marginTop="24dp"
-                app:cardBackgroundColor="@color/color_bg_card"
+                app:cardBackgroundColor="@android:color/transparent"
                 app:cardCornerRadius="16dp"
                 app:cardElevation="0dp"
                 app:strokeWidth="0dp">
@@ -90,14 +83,10 @@
                     android:padding="20dp">
 
                         <TextView
+                            style="@style/Text.SectionHeader"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="@string/withdraw_melt_destination_label"
-                            android:fontFamily="sans-serif"
-                            android:textSize="13sp"
-                            android:textColor="@color/color_text_secondary"
-                            android:textAllCaps="true"
-                            android:letterSpacing="0.03" />
+                            android:text="@string/withdraw_melt_destination_label" />
 
                         <TextView
                             android:id="@+id/destination_text"
@@ -119,7 +108,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="20dp"
                 android:layout_marginTop="16dp"
-                app:cardBackgroundColor="@color/color_bg_card"
+                app:cardBackgroundColor="@android:color/transparent"
                 app:cardCornerRadius="16dp"
                 app:cardElevation="0dp"
                 app:strokeWidth="0dp">
@@ -242,7 +231,7 @@
         style="@style/Widget.Button.Primary.Green"
         android:layout_width="match_parent"
         android:layout_height="52dp"
-        android:layout_marginHorizontal="20dp"
+        android:layout_marginHorizontal="40dp"
         android:layout_marginBottom="24dp"
         android:text="@string/withdraw_melt_title"
         android:textAllCaps="false"
@@ -387,7 +376,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="20dp"
                 android:layout_marginTop="16dp"
-                app:cardBackgroundColor="@color/color_bg_card"
+                app:cardBackgroundColor="@android:color/transparent"
                 app:cardCornerRadius="16dp"
                 app:cardElevation="0dp"
                 app:strokeWidth="0dp">
diff --git a/app/src/main/res/layout/bottom_sheet_add_mint.xml b/app/src/main/res/layout/bottom_sheet_add_mint.xml
new file mode 100644
index 00000000..a8ae4f4c
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet_add_mint.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@drawable/bg_bottom_sheet_dark"
+        android:paddingBottom="32dp">
+
+        <!-- Drag Handle -->
+        <View
+            android:layout_width="36dp"
+            android:layout_height="4dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="12dp"
+            android:background="#26FFFFFF" />
+
+        <!-- Title -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:paddingHorizontal="24dp"
+            android:text="@string/onboarding_add_mint_sheet_title"
+            android:textSize="20sp"
+            android:textColor="#FFFFFF"
+            android:fontFamily="sans-serif-medium" />
+
+        <!-- URL Input -->
+        <EditText
+            android:id="@+id/mint_url_input"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginHorizontal="24dp"
+            android:hint="@string/onboarding_add_mint_url_hint"
+            android:textSize="15sp"
+            android:textColor="#FFFFFF"
+            android:textColorHint="#4DFFFFFF"
+            android:background="@drawable/bg_seed_input_dark"
+            android:paddingHorizontal="16dp"
+            android:inputType="textUri"
+            android:singleLine="true"
+            android:imeOptions="actionDone"
+            android:importantForAutofill="no" />
+
+        <!-- Add Button / Loading Container -->
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginHorizontal="24dp">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/add_mint_button"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="@string/onboarding_add_mint_button"
+                android:textColor="@color/button_text_onboarding"
+                android:textAllCaps="false"
+                android:textSize="17sp"
+                android:background="@drawable/bg_button_white"
+                android:stateListAnimator="@null"
+                app:backgroundTint="@null"
+                app:cornerRadius="28dp"
+                app:elevation="0dp"
+                android:enabled="false" />
+
+            <LinearLayout
+                android:id="@+id/add_mint_loading"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:gravity="center"
+                android:visibility="gone">
+
+                <ProgressBar
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:indeterminate="true"
+                    android:indeterminateTint="@color/numo_fluorescent_green" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/onboarding_add_mint_loading"
+                    android:textSize="15sp"
+                    android:textColor="#FFFFFF" />
+
+            </LinearLayout>
+
+        </FrameLayout>
+
+        <!-- Scan QR Code Button -->
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/scan_qr_button"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginHorizontal="24dp"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="@string/onboarding_add_mint_scan_qr"
+            android:textAllCaps="false"
+            android:textSize="17sp"
+            android:textColor="#FFFFFF"
+            android:fontFamily="sans-serif-medium"
+            android:stateListAnimator="@null"
+            app:elevation="0dp"
+            app:backgroundTint="@android:color/transparent"
+            app:strokeColor="#26FFFFFF"
+            app:strokeWidth="1dp"
+            app:cornerRadius="26dp"
+            app:icon="@drawable/ic_qr_scan"
+            app:iconGravity="textStart"
+            app:iconPadding="8dp"
+            app:iconTint="#FFFFFF"
+            app:rippleColor="#1AFFFFFF" />
+
+    </LinearLayout>
+
+</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/component_empty_state.xml b/app/src/main/res/layout/component_empty_state.xml
new file mode 100644
index 00000000..31509f3d
--- /dev/null
+++ b/app/src/main/res/layout/component_empty_state.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:paddingVertical="40dp"
+    android:paddingHorizontal="24dp">
+
+    <!-- Rounded square icon container -->
+    <FrameLayout
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:background="@drawable/bg_empty_state_icon">
+
+        <ImageView
+            android:id="@+id/empty_state_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center"
+            app:tint="@color/color_text_tertiary" />
+
+    </FrameLayout>
+
+    <!-- Title -->
+    <TextView
+        android:id="@+id/empty_state_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center"
+        android:letterSpacing="-0.012"
+        android:textColor="@color/color_text_primary"
+        android:textSize="15sp" />
+
+    <!-- Description -->
+    <TextView
+        android:id="@+id/empty_state_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:lineSpacingMultiplier="1.5"
+        android:maxWidth="260dp"
+        android:textColor="@color/color_text_tertiary"
+        android:textSize="13sp" />
+
+    <!-- Optional action button (hidden by default) -->
+    <TextView
+        android:id="@+id/empty_state_action"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/bg_empty_state_action_button"
+        android:drawablePadding="6dp"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center"
+        android:paddingHorizontal="20dp"
+        android:paddingVertical="10dp"
+        android:textColor="@color/color_text_secondary"
+        android:textSize="13sp"
+        android:visibility="gone" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/component_withdraw_address_card.xml b/app/src/main/res/layout/component_withdraw_address_card.xml
index 0ae7253e..c25e10e2 100644
--- a/app/src/main/res/layout/component_withdraw_address_card.xml
+++ b/app/src/main/res/layout/component_withdraw_address_card.xml
@@ -6,139 +6,65 @@
     android:orientation="vertical"
     android:padding="20dp">
 
-    <!-- Header Row -->
-    <LinearLayout
-        android:layout_width="match_parent"
+    <!-- Lightning Address Label -->
+    <TextView
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <!-- Icon Container -->
-        <FrameLayout
-            android:id="@+id/icon_container"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="@drawable/bg_circle_accent_light">
-
-            <ImageView
-                android:id="@+id/address_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_gravity="center"
-                android:src="@drawable/ic_email"
-                android:tint="@color/color_primary"
-                android:contentDescription="@string/withdraw_address_card_title" />
-
-        </FrameLayout>
-
-        <!-- Title and Subtitle -->
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginStart="16dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/title_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/withdraw_address_card_title"
-                android:textColor="@color/color_text_primary"
-                android:textSize="17sp"
-                android:fontFamily="sans-serif-medium" />
-
-            <TextView
-                android:id="@+id/subtitle_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="@string/withdraw_address_card_subtitle"
-                android:textAppearance="@style/Text.Caption"
-                android:textColor="@color/color_text_secondary"
-                android:textSize="13sp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <!-- Input Container -->
-    <LinearLayout
-        android:id="@+id/input_container"
+        android:layout_marginBottom="12dp"
+        android:fontFamily="sans-serif-medium"
+        android:text="@string/withdraw_address_card_title"
+        android:textColor="@color/color_text_primary"
+        android:textSize="15sp" />
+
+    <!-- Address Input -->
+    <EditText
+        android:id="@+id/address_input"
         android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:background="@drawable/bg_input_pill"
+        android:fontFamily="sans-serif"
+        android:hint="@string/withdraw_lightning_address_hint_value"
+        android:inputType="textEmailAddress"
+        android:paddingHorizontal="20dp"
+        android:textColor="@color/color_text_primary"
+        android:textColorHint="@color/color_text_tertiary"
+        android:textSize="16sp" />
+
+    <!-- Amount Label -->
+    <TextView
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:orientation="vertical">
-
-        <!-- Address Label -->
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/withdraw_lightning_address_hint_label"
-            android:textAppearance="@style/Text.Caption"
-            android:textColor="@color/color_text_secondary"
-            android:textSize="12sp"
-            android:textAllCaps="true"
-            android:letterSpacing="0.05" />
-
-        <!-- Address Input -->
-        <EditText
-            android:id="@+id/address_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/bg_input_pill"
-            android:hint="@string/withdraw_lightning_address_hint_value"
-            android:inputType="textEmailAddress"
-            android:minHeight="52dp"
-            android:padding="14dp"
-            android:textAppearance="@style/Text.Body"
-            android:textColor="@color/color_text_primary"
-            android:textColorHint="@color/color_text_tertiary"
-            android:textSize="15sp" />
-
-        <!-- Amount Label -->
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/withdraw_lightning_amount_label"
-            android:textAppearance="@style/Text.Caption"
-            android:textColor="@color/color_text_secondary"
-            android:textSize="12sp"
-            android:textAllCaps="true"
-            android:letterSpacing="0.05" />
-
-        <!-- Amount Input -->
-        <EditText
-            android:id="@+id/amount_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/bg_input_pill"
-            android:hint="@string/withdraw_amount_placeholder"
-            android:inputType="number"
-            android:minHeight="52dp"
-            android:padding="14dp"
-            android:textAppearance="@style/Text.Body"
-            android:textColor="@color/color_text_primary"
-            android:textColorHint="@color/color_text_tertiary"
-            android:textSize="15sp" />
-
-        <!-- Continue Button -->
-        <Button
-            android:id="@+id/continue_button"
-            style="@style/Widget.Button.Primary.Green"
-            android:layout_width="match_parent"
-            android:layout_height="52dp"
-            android:layout_marginTop="16dp"
-            android:enabled="false"
-            android:alpha="0.5"
-            android:text="@string/withdraw_continue_button"
-            android:textAllCaps="false"
-            android:textSize="17sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
+        android:layout_marginBottom="12dp"
+        android:fontFamily="sans-serif-medium"
+        android:text="@string/withdraw_lightning_amount_label"
+        android:textColor="@color/color_text_primary"
+        android:textSize="15sp" />
+
+    <!-- Amount Input -->
+    <EditText
+        android:id="@+id/amount_input"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:background="@drawable/bg_input_pill"
+        android:fontFamily="sans-serif"
+        android:hint="@string/withdraw_amount_placeholder"
+        android:inputType="number"
+        android:paddingHorizontal="20dp"
+        android:textColor="@color/color_text_primary"
+        android:textColorHint="@color/color_text_tertiary"
+        android:textSize="16sp" />
+
+    <!-- Continue Button -->
+    <Button
+        android:id="@+id/continue_button"
+        style="@style/Widget.Button.Primary.Green"
+        android:layout_width="match_parent"
+        android:layout_height="52dp"
+        android:layout_marginTop="16dp"
+        android:enabled="false"
+        android:text="@string/withdraw_continue_button"
+        android:textAllCaps="false"
+        android:textSize="17sp" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/component_withdraw_invoice_card.xml b/app/src/main/res/layout/component_withdraw_invoice_card.xml
index 3b6c9654..0e9bfe10 100644
--- a/app/src/main/res/layout/component_withdraw_invoice_card.xml
+++ b/app/src/main/res/layout/component_withdraw_invoice_card.xml
@@ -6,132 +6,76 @@
     android:orientation="vertical"
     android:padding="20dp">
 
-    <!-- Header Row -->
-    <LinearLayout
-        android:layout_width="match_parent"
+    <!-- Lightning Invoice Label -->
+    <TextView
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <!-- Icon Container -->
-        <FrameLayout
-            android:id="@+id/icon_container"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="@drawable/bg_circle_accent_light">
-
-            <ImageView
-                android:id="@+id/invoice_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_gravity="center"
-                android:src="@drawable/ic_lightning_bolt"
-                android:tint="@color/color_primary"
-                android:contentDescription="@string/withdraw_invoice_card_title" />
-
-        </FrameLayout>
-
-        <!-- Title and Subtitle -->
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginStart="16dp"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/title_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/withdraw_invoice_card_title"
-                android:textColor="@color/color_text_primary"
-                android:textSize="17sp"
-                android:fontFamily="sans-serif-medium" />
-
-            <TextView
-                android:id="@+id/subtitle_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
-                android:text="@string/withdraw_invoice_card_subtitle"
-                android:textAppearance="@style/Text.Caption"
-                android:textColor="@color/color_text_secondary"
-                android:textSize="13sp" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <!-- Input Container -->
-    <LinearLayout
-        android:id="@+id/input_container"
+        android:layout_marginBottom="12dp"
+        android:fontFamily="sans-serif-medium"
+        android:text="@string/withdraw_invoice_card_title"
+        android:textColor="@color/color_text_primary"
+        android:textSize="15sp" />
+
+    <!-- Input Field -->
+    <EditText
+        android:id="@+id/invoice_input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:orientation="vertical">
-
-        <!-- Header with Label and Scan Button -->
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical">
-
-            <!-- Invoice Label -->
-            <TextView
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/withdraw_lightning_invoice_hint_label"
-                android:textAppearance="@style/Text.Caption"
-                android:textColor="@color/color_text_secondary"
-                android:textSize="12sp"
-                android:textAllCaps="true"
-                android:letterSpacing="0.05" />
-
-            <!-- Scan Button -->
-            <ImageButton
-                android:id="@+id/scan_button"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_qr_scan"
-                android:tint="@color/color_primary"
-                android:contentDescription="@string/withdraw_scan_qr" />
-        </LinearLayout>
-
-        <!-- Invoice Input -->
-        <EditText
-            android:id="@+id/invoice_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/bg_input_pill"
-            android:hint="@string/withdraw_invoice_placeholder"
-            android:inputType="textMultiLine"
-            android:maxLines="4"
-            android:minHeight="80dp"
-            android:padding="14dp"
-            android:textAppearance="@style/Text.Body"
-            android:textColor="@color/color_text_primary"
-            android:textColorHint="@color/color_text_tertiary"
-            android:textSize="14sp"
-            android:gravity="top" />
-
-        <!-- Continue Button -->
-        <Button
-            android:id="@+id/continue_button"
-            style="@style/Widget.Button.Primary.Green"
-            android:layout_width="match_parent"
-            android:layout_height="52dp"
-            android:layout_marginTop="16dp"
-            android:enabled="false"
-            android:alpha="0.5"
-            android:text="@string/withdraw_continue_button"
-            android:textAllCaps="false"
-            android:textSize="17sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
+        android:background="@drawable/bg_input_pill"
+        android:fontFamily="sans-serif"
+        android:hint="@string/withdraw_invoice_placeholder"
+        android:inputType="textMultiLine"
+        android:maxLines="4"
+        android:minHeight="80dp"
+        android:padding="14dp"
+        android:gravity="top"
+        android:textColor="@color/color_text_primary"
+        android:textColorHint="@color/color_text_tertiary"
+        android:textSize="14sp" />
+
+    <!-- Helper Text -->
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:alpha="0.7"
+        android:text="@string/withdraw_invoice_helper"
+        android:textColor="@color/color_text_secondary"
+        android:textSize="13sp" />
+
+    <!-- Continue Button -->
+    <Button
+        android:id="@+id/continue_button"
+        style="@style/Widget.Button.Primary.Green"
+        android:layout_width="match_parent"
+        android:layout_height="52dp"
+        android:layout_marginTop="16dp"
+        android:enabled="false"
+        android:text="@string/withdraw_continue_button"
+        android:textAllCaps="false"
+        android:textSize="17sp" />
+
+    <!-- Scan Invoice Button -->
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/scan_button"
+        android:layout_width="match_parent"
+        android:layout_height="52dp"
+        android:layout_marginTop="12dp"
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="@string/withdraw_scan_invoice_button"
+        android:textAllCaps="false"
+        android:textSize="17sp"
+        android:textColor="@color/color_text_primary"
+        android:fontFamily="sans-serif-medium"
+        app:backgroundTint="@color/color_bg_white"
+        app:strokeColor="@color/color_chip_border"
+        app:strokeWidth="1dp"
+        app:cornerRadius="26dp"
+        app:icon="@drawable/ic_qr_scan"
+        app:iconGravity="textStart"
+        app:iconPadding="8dp"
+        app:iconTint="@color/color_text_primary"
+        app:rippleColor="@color/color_ripple" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_auto_withdraw_history.xml b/app/src/main/res/layout/item_auto_withdraw_history.xml
index 6a9a6870..7ce3b776 100644
--- a/app/src/main/res/layout/item_auto_withdraw_history.xml
+++ b/app/src/main/res/layout/item_auto_withdraw_history.xml
@@ -13,26 +13,55 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="20dp"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:paddingHorizontal="24dp"
         android:paddingVertical="16dp">
 
-        <!-- Status Icon Container -->
+        <!-- Icon container with status badge overlay -->
         <FrameLayout
             android:id="@+id/icon_container"
-            android:layout_width="44dp"
-            android:layout_height="44dp"
-            android:background="@drawable/bg_circle"
-            android:backgroundTint="@color/color_bg_secondary"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <ImageView
-                android:id="@+id/status_icon"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+            <!-- Main direction icon circle -->
+            <FrameLayout
+                android:layout_width="44dp"
+                android:layout_height="44dp"
                 android:layout_gravity="center"
-                android:src="@drawable/ic_lightning_bolt"
-                app:tint="@color/color_success_green" />
+                android:background="@drawable/bg_chip_circle"
+                android:backgroundTint="@color/color_bg_light">
+
+                <ImageView
+                    android:id="@+id/status_icon"
+                    android:layout_width="20dp"
+                    android:layout_height="20dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_arrow_up_send"
+                    app:tint="@color/color_text_primary" />
+            </FrameLayout>
+
+            <!-- Status badge (top-start corner) -->
+            <FrameLayout
+                android:id="@+id/status_badge_icon_container"
+                android:layout_width="22dp"
+                android:layout_height="22dp"
+                android:layout_gravity="top|start"
+                android:layout_marginStart="-4dp"
+                android:layout_marginTop="-4dp"
+                android:background="@drawable/bg_status_badge_green"
+                android:visibility="gone">
+
+                <ImageView
+                    android:layout_width="12dp"
+                    android:layout_height="12dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_check_small" />
+            </FrameLayout>
 
         </FrameLayout>
 
@@ -41,7 +70,7 @@
             android:id="@+id/amount_text"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="14dp"
             android:layout_marginEnd="12dp"
             android:ellipsize="end"
             android:fontFamily="sans-serif-medium"
@@ -58,11 +87,10 @@
             android:id="@+id/address_text"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="2dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="4dp"
             android:layout_marginEnd="12dp"
             android:ellipsize="middle"
-            android:fontFamily="sans-serif"
             android:maxLines="1"
             android:textColor="@color/color_text_secondary"
             android:textSize="14sp"
@@ -76,14 +104,13 @@
             android:id="@+id/mint_text"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="14dp"
             android:layout_marginTop="2dp"
             android:layout_marginEnd="12dp"
             android:ellipsize="end"
-            android:fontFamily="sans-serif"
             android:maxLines="1"
-            android:textColor="@color/color_text_tertiary"
-            android:textSize="12sp"
+            android:textColor="@color/color_text_secondary"
+            android:textSize="14sp"
             app:layout_constraintEnd_toStartOf="@id/status_badge"
             app:layout_constraintStart_toEndOf="@id/icon_container"
             app:layout_constraintTop_toBottomOf="@id/address_text"
@@ -94,12 +121,11 @@
             android:id="@+id/timestamp_text"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="14dp"
             android:layout_marginTop="2dp"
             android:layout_marginEnd="12dp"
-            android:fontFamily="sans-serif"
-            android:textColor="@color/color_text_tertiary"
-            android:textSize="12sp"
+            android:textColor="@color/color_text_secondary"
+            android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/icon_container"
             app:layout_constraintTop_toBottomOf="@id/mint_text"
@@ -138,17 +164,17 @@
             app:layout_constraintTop_toBottomOf="@id/status_badge"
             tools:visibility="visible" />
 
-        <!-- Expand indicator for failed items -->
+        <!-- Expand/share indicator -->
         <ImageView
             android:id="@+id/expand_indicator"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginTop="4dp"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
             android:src="@drawable/ic_chevron_down"
             android:visibility="gone"
             app:tint="@color/color_text_tertiary"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/status_badge"
+            app:layout_constraintTop_toTopOf="@id/icon_container"
+            app:layout_constraintBottom_toBottomOf="parent"
             tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_basket_name_preset.xml b/app/src/main/res/layout/item_basket_name_preset.xml
index 8cdcc57f..d7e4324b 100644
--- a/app/src/main/res/layout/item_basket_name_preset.xml
+++ b/app/src/main/res/layout/item_basket_name_preset.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="56dp"
-    android:paddingHorizontal="16dp"
-    android:background="?attr/selectableItemBackground">
+    android:layout_height="wrap_content"
+    android:paddingVertical="14dp"
+    android:paddingHorizontal="20dp"
+    android:background="@drawable/bg_row_ripple">
 
     <!-- Name Text -->
     <TextView
         android:id="@+id/preset_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textSize="17sp"
-        android:textColor="@color/color_text_primary"
-        android:fontFamily="sans-serif"
+        android:textAppearance="@style/Text.RowTitle"
         android:ellipsize="end"
         android:maxLines="1"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_explainer_slide.xml b/app/src/main/res/layout/item_explainer_slide.xml
new file mode 100644
index 00000000..431c5c96
--- /dev/null
+++ b/app/src/main/res/layout/item_explainer_slide.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingHorizontal="32dp"
+    android:clipToPadding="false"
+    android:clipChildren="false">
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="32dp" />
+
+    <TextView
+        android:id="@+id/slide_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="42sp"
+        android:fontFamily="sans-serif-black"
+        android:textColor="@color/numo_fluorescent_green"
+        android:textAllCaps="true"
+        android:letterSpacing="-0.035"
+        android:lineSpacingMultiplier="1.0" />
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="16dp" />
+
+    <TextView
+        android:id="@+id/slide_body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxWidth="300dp"
+        android:textSize="16sp"
+        android:textColor="#FFFFFF"
+        android:lineSpacingMultiplier="1.5" />
+
+    <FrameLayout
+        android:id="@+id/slide_illustration_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_marginHorizontal="-32dp"
+        android:clipChildren="true"
+        android:clipToPadding="true">
+
+        <!-- Default single illustration (used by slides 2, 3) -->
+        <ImageView
+            android:id="@+id/slide_illustration"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginHorizontal="32dp"
+            android:scaleType="fitCenter"
+            android:contentDescription="@null" />
+
+        <!-- Phone from right (Numo invoice — merchant, behind) -->
+        <ImageView
+            android:id="@+id/slide_phone_right"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginStart="80dp"
+            android:layout_marginEnd="-120dp"
+            android:scaleType="fitCenter"
+            android:rotation="-5"
+            android:visibility="gone"
+            android:contentDescription="@null" />
+
+        <!-- Phone from left (Minibits NFC — customer, on top) -->
+        <ImageView
+            android:id="@+id/slide_phone_left"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_marginEnd="80dp"
+            android:layout_marginStart="-120dp"
+            android:scaleType="fitCenter"
+            android:rotation="5"
+            android:visibility="gone"
+            android:contentDescription="@null" />
+
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_mint_contact.xml b/app/src/main/res/layout/item_mint_contact.xml
index abb4497d..3cd7f359 100644
--- a/app/src/main/res/layout/item_mint_contact.xml
+++ b/app/src/main/res/layout/item_mint_contact.xml
@@ -5,7 +5,8 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:padding="16dp">
+    android:paddingVertical="14dp"
+    android:paddingHorizontal="20dp">
 
     <!-- Method (label on left, takes space to push value right) -->
     <TextView
diff --git a/app/src/main/res/layout/item_mint_selection.xml b/app/src/main/res/layout/item_mint_selection.xml
index ef86aa3f..45ffd046 100644
--- a/app/src/main/res/layout/item_mint_selection.xml
+++ b/app/src/main/res/layout/item_mint_selection.xml
@@ -12,31 +12,12 @@
     android:clickable="true"
     android:focusable="true">
 
-    <!-- Mint Icon Container -->
-    <FrameLayout
-        android:id="@+id/icon_container"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:background="@drawable/bg_circle_accent_light">
-
-        <ImageView
-            android:id="@+id/mint_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center"
-            android:src="@drawable/ic_lightning_bolt"
-            android:tint="@color/color_primary"
-            android:contentDescription="@string/mint_selection_icon_description" />
-
-    </FrameLayout>
-
     <!-- Text Content -->
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:orientation="vertical"
-        android:layout_marginStart="16dp"
         android:layout_marginEnd="12dp">
 
         <TextView
@@ -44,10 +25,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Mint Name"
-            android:textAppearance="@style/Text.Body"
+            android:fontFamily="sans-serif-medium"
             android:textColor="@color/color_text_primary"
-            android:textSize="16sp"
-            android:textStyle="bold"
+            android:textSize="17sp"
             android:maxLines="1"
             android:ellipsize="end" />
 
@@ -55,11 +35,10 @@
             android:id="@+id/mint_url"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="4dp"
             android:text="mint.example.com"
-            android:textAppearance="@style/Text.Caption"
-            android:textColor="@color/color_text_tertiary"
-            android:textSize="12sp"
+            android:textColor="@color/color_text_secondary"
+            android:textSize="14sp"
             android:maxLines="1"
             android:ellipsize="end" />
 
@@ -71,10 +50,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="₿1,234"
-        android:textAppearance="@style/Text.Body"
+        android:fontFamily="sans-serif-medium"
         android:textColor="@color/color_success_green"
         android:textSize="15sp"
-        android:textStyle="bold"
         android:layout_marginEnd="8dp" />
 
     <!-- Chevron -->
diff --git a/app/src/main/res/layout/item_onboarding_mint.xml b/app/src/main/res/layout/item_onboarding_mint.xml
new file mode 100644
index 00000000..ab6ed13f
--- /dev/null
+++ b/app/src/main/res/layout/item_onboarding_mint.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="12dp"
+    android:paddingBottom="12dp">
+
+    <com.google.android.material.imageview.ShapeableImageView
+        android:id="@+id/mint_icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:scaleType="centerCrop" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="10dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/mint_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="15sp"
+            android:fontFamily="sans-serif-medium"
+            android:textColor="#FFFFFF"
+            android:maxLines="1"
+            android:ellipsize="end" />
+
+        <TextView
+            android:id="@+id/mint_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:textSize="12sp"
+            android:fontFamily="sans-serif"
+            android:textColor="#99FFFFFF" />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/mint_checkbox"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
+        android:importantForAccessibility="no" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_onboarding_mint_add.xml b/app/src/main/res/layout/item_onboarding_mint_add.xml
new file mode 100644
index 00000000..4b780795
--- /dev/null
+++ b/app/src/main/res/layout/item_onboarding_mint_add.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="4dp"
+    android:paddingBottom="8dp">
+
+    <TextView
+        android:id="@+id/add_mint_text"
+        android:layout_width="match_parent"
+        android:layout_height="52dp"
+        android:background="@drawable/bg_mint_add_button"
+        android:gravity="center"
+        android:text="@string/onboarding_mints_add_new_button"
+        android:textSize="15sp"
+        android:textColor="#99FFFFFF"
+        android:fontFamily="sans-serif-medium" />
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_onboarding_mint_header.xml b/app/src/main/res/layout/item_onboarding_mint_header.xml
new file mode 100644
index 00000000..217b7867
--- /dev/null
+++ b/app/src/main/res/layout/item_onboarding_mint_header.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:paddingBottom="8dp">
+
+    <TextView
+        android:id="@+id/header_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:fontFamily="sans-serif-medium"
+        android:letterSpacing="0.05"
+        android:textAllCaps="true"
+        android:textColor="#FFFFFF"
+        android:textSize="13sp" />
+
+    <TextView
+        android:id="@+id/header_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif"
+        android:textColor="#73FFFFFF"
+        android:textSize="12sp" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_onboarding_mint_hero.xml b/app/src/main/res/layout/item_onboarding_mint_hero.xml
new file mode 100644
index 00000000..c35b0197
--- /dev/null
+++ b/app/src/main/res/layout/item_onboarding_mint_hero.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="8dp"
+    app:cardBackgroundColor="@android:color/transparent"
+    app:cardCornerRadius="20dp"
+    app:cardElevation="0dp">
+
+    <FrameLayout
+        android:id="@+id/hero_bg"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_hero_gradient_dark"
+        android:clipChildren="false">
+
+        <!-- Decorative background lightning bolt with fade -->
+        <FrameLayout
+            android:layout_width="140dp"
+            android:layout_height="140dp"
+            android:layout_gravity="bottom|end"
+            android:layout_marginEnd="-30dp"
+            android:layout_marginBottom="-30dp">
+
+            <ImageView
+                android:id="@+id/hero_bolt"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:alpha="0.08"
+                android:importantForAccessibility="no"
+                android:rotation="-15"
+                android:src="@drawable/ic_lightning_bolt"
+                app:tint="@color/numo_fluorescent_green" />
+
+        </FrameLayout>
+
+        <!-- Content -->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="20dp">
+
+            <!-- "DEFAULT MINT" label -->
+            <TextView
+                android:id="@+id/hero_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:letterSpacing="0.05"
+                android:text="@string/onboarding_mints_hero_label"
+                android:textColor="@color/numo_fluorescent_green"
+                android:textSize="13sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <!-- Mint Identity Row -->
+            <LinearLayout
+                android:id="@+id/hero_mint_row"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/hero_label">
+
+                <com.google.android.material.imageview.ShapeableImageView
+                    android:id="@+id/hero_mint_icon"
+                    android:layout_width="44dp"
+                    android:layout_height="44dp"
+                    android:scaleType="centerCrop" />
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/hero_mint_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:fontFamily="sans-serif-medium"
+                        android:maxLines="1"
+                        android:textColor="#FFFFFF"
+                        android:textSize="15sp" />
+
+                    <TextView
+                        android:id="@+id/hero_mint_subtitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="2dp"
+                        android:fontFamily="sans-serif"
+                        android:text="@string/onboarding_mints_hero_subtitle"
+                        android:textColor="#99FFFFFF"
+                        android:textSize="13sp" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!-- Divider -->
+            <View
+                android:id="@+id/hero_divider"
+                android:layout_width="0dp"
+                android:layout_height="1dp"
+                android:layout_marginTop="16dp"
+                android:background="#1AFFFFFF"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/hero_mint_row" />
+
+            <!-- Helper text -->
+            <TextView
+                android:id="@+id/hero_helper"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="12dp"
+                android:fontFamily="sans-serif"
+                android:lineSpacingMultiplier="1.4"
+                android:text="@string/onboarding_mints_hero_helper"
+                android:textColor="#73FFFFFF"
+                android:textSize="13sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/hero_divider" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </FrameLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_onboarding_mint_hint.xml b/app/src/main/res/layout/item_onboarding_mint_hint.xml
new file mode 100644
index 00000000..da962e44
--- /dev/null
+++ b/app/src/main/res/layout/item_onboarding_mint_hint.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/hint_text"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:paddingTop="8dp"
+    android:paddingBottom="12dp"
+    android:text="@string/onboarding_mints_long_press_hint"
+    android:textSize="12sp"
+    android:textColor="#73FFFFFF"
+    android:fontFamily="sans-serif" />
diff --git a/app/src/main/res/layout/item_product.xml b/app/src/main/res/layout/item_product.xml
index a78e7c30..c2670eca 100644
--- a/app/src/main/res/layout/item_product.xml
+++ b/app/src/main/res/layout/item_product.xml
@@ -79,10 +79,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textColor="@color/color_text_primary"
-                android:textSize="17sp"
-                android:fontFamily="sans-serif-medium"
-                android:letterSpacing="-0.01"
+                android:textAppearance="@style/Text.RowTitle"
                 tools:text="Classic T-Shirt" />
 
             <!-- Item Variation (grey, smaller) -->
@@ -93,8 +90,7 @@
                 android:layout_marginTop="2dp"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textColor="@color/color_text_tertiary"
-                android:textSize="15sp"
+                android:textAppearance="@style/Text.RowSubtitle"
                 android:visibility="gone"
                 tools:text="Medium / Navy Blue"
                 tools:visibility="visible" />
diff --git a/app/src/main/res/layout/item_product_selection.xml b/app/src/main/res/layout/item_product_selection.xml
index a971b183..d4faa69b 100644
--- a/app/src/main/res/layout/item_product_selection.xml
+++ b/app/src/main/res/layout/item_product_selection.xml
@@ -65,9 +65,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textColor="@color/color_text_primary"
-                android:textSize="16sp"
-                android:fontFamily="sans-serif-medium"
+                android:textAppearance="@style/Text.RowTitle"
                 tools:text="Classic T-Shirt" />
 
             <!-- Item Variation (grey, smaller) -->
@@ -78,8 +76,8 @@
                 android:layout_marginTop="1dp"
                 android:ellipsize="end"
                 android:maxLines="1"
+                android:textAppearance="@style/Text.RowSubtitle"
                 android:textColor="@color/color_text_tertiary"
-                android:textSize="14sp"
                 android:visibility="gone"
                 tools:text="Medium / Navy Blue"
                 tools:visibility="visible" />
diff --git a/app/src/main/res/layout/item_webhook_endpoint.xml b/app/src/main/res/layout/item_webhook_endpoint.xml
index 7b7e5446..f31bca1a 100644
--- a/app/src/main/res/layout/item_webhook_endpoint.xml
+++ b/app/src/main/res/layout/item_webhook_endpoint.xml
@@ -2,18 +2,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="72dp"
-    android:background="?attr/selectableItemBackground"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_row_ripple"
     android:clickable="true"
     android:focusable="true"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingHorizontal="16dp">
+    android:paddingVertical="14dp"
+    android:paddingHorizontal="20dp">
 
     <ImageView
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginEnd="12dp"
+        android:layout_marginEnd="14dp"
         android:src="@drawable/ic_link"
         app:tint="@color/color_icon_secondary" />
 
@@ -29,9 +30,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@color/color_text_primary"
-            android:textSize="16sp"
-            android:fontFamily="sans-serif-medium" />
+            android:textAppearance="@style/Text.RowTitle" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -52,8 +51,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/webhook_settings_auth_not_set"
-                android:textColor="@color/color_text_secondary"
-                android:textSize="13sp" />
+                android:textAppearance="@style/Text.RowSubtitle" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e88efe14..5cd5e2fd 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -118,6 +118,16 @@
     <string name="onboarding_restore_wallet_title">Restaurar desde copia de seguridad</string>
     <string name="onboarding_restore_wallet_subtitle">Usa tu frase semilla existente</string>
 
+    <!-- Explainer -->
+    <string name="explainer_teaser_title">Cmo funciona Numo?</string>
+    <string name="explainer_slide1_title">Toca para cobrar</string>
+    <string name="explainer_slide1_body">Ingresa un monto, toca cobrar y tu cliente acerca su telfono al tuyo. El pago llega al instante por NFC.</string>
+    <string name="explainer_slide2_title">Auto-custodia automtica</string>
+    <string name="explainer_slide2_body">Configura el retiro automtico para mover los pagos entrantes directamente a tu billetera Lightning. Numo es auto-custodia por defecto.</string>
+    <string name="explainer_slide3_title">Cero comisiones</string>
+    <string name="explainer_slide3_body">Numo es completamente de cdigo abierto y no cobra comisiones. Sin suscripciones, sin recortes, sin costos ocultos. Cada sat que recibes es tuyo.</string>
+    <string name="explainer_image_placeholder">Imagen de ejemplo</string>
+
     <!-- Onboarding / Restore Seed Entry -->
     <string name="onboarding_seed_toolbar_back">Atrás</string>
     <string name="onboarding_seed_toolbar_title">Restaurar cartera</string>
@@ -158,6 +168,21 @@
     <string name="onboarding_mints_count">Has seleccionado %1$d mint%2$s</string>
     <string name="onboarding_mints_continue_restore">Restaurar cartera</string>
     <string name="onboarding_mints_continue_new_wallet">Continuar</string>
+    <string name="onboarding_mints_hero_label">MINT PREDETERMINADO</string>
+    <string name="onboarding_mints_hero_subtitle">Guarda tu bitcoin</string>
+    <string name="onboarding_mints_hero_default_badge">Predeterminado</string>
+    <string name="onboarding_mints_hero_helper">Retira a tu propia billetera en cualquier momento, o establece un umbral de pago para hacerlo automáticamente.</string>
+    <string name="onboarding_mints_accept_from_header">ACEPTAR DE</string>
+    <string name="onboarding_mints_count_label">%1$d mints</string>
+    <string name="onboarding_mints_count_label_singular">%1$d mint</string>
+    <string name="onboarding_mints_status_accepting">Aceptando pagos</string>
+    <string name="onboarding_mints_status_not_accepting">No aceptando</string>
+    <string name="onboarding_mints_long_press_hint">Mantén presionado un mint para establecerlo como predeterminado</string>
+    <string name="onboarding_mints_add_new_button">+ Agregar Nuevo Mint</string>
+    <string name="onboarding_mints_set_default_title">¿Establecer como predeterminado?</string>
+    <string name="onboarding_mints_set_default_message">¿Hacer \"%1$s\" tu mint predeterminado?</string>
+    <string name="onboarding_mints_set_default_confirm">Establecer como predeterminado</string>
+    <string name="onboarding_mints_set_default_cancel">Cancelar</string>
 
     <!-- Onboarding / Restoring -->
     <string name="onboarding_restoring_title">Restaurando cartera</string>
@@ -291,7 +316,7 @@
     <string name="withdraw_lightning_option_address">📧 Dirección Lightning</string>
     <string name="withdraw_lightning_address_hint_label">Introduce una dirección Lightning</string>
     <string name="withdraw_lightning_address_hint_value">usuario@dominio.com</string>
-    <string name="withdraw_lightning_amount_label">Cantidad (sats)</string>
+    <string name="withdraw_lightning_amount_label">Cantidad</string>
     <string name="withdraw_lightning_amount_hint">1000</string>
     <string name="withdraw_lightning_button_continue">Continuar</string>
 
@@ -313,7 +338,7 @@
     <string name="withdraw_melt_amount_label">Cantidad</string>
     <string name="withdraw_melt_fee_label">Reserva de comisión</string>
     <string name="withdraw_melt_total_label">Total</string>
-    <string name="withdraw_melt_fee_note">La reserva de comisión se devolverá si la comisión real de Lightning es menor.</string>
+    <string name="withdraw_melt_fee_note">La reserva de comisión se devolverá si la comisión de Lightning es menor.</string>
     <string name="withdraw_melt_loading">Procesando retiro...</string>
 
     <!-- Withdraw - melt errors and states -->
@@ -636,8 +661,10 @@
 
     <!-- Auto-Withdraw Settings -->
     <string name="auto_withdraw_title">Retiros</string>
+    <string name="auto_withdraw_hero_label">RETIRO AUTOMÁTICO</string>
     <string name="auto_withdraw_hero_title">Retiro automático</string>
     <string name="auto_withdraw_hero_subtitle">Envía fondos automáticamente a tu cartera Lightning cuando el saldo supere un umbral</string>
+    <string name="auto_withdraw_hero_helper">Establece un umbral de pago y una dirección Lightning para retirar automáticamente cuando tu saldo alcance el límite.</string>
     <string name="auto_withdraw_status_active">Activo</string>
     <string name="auto_withdraw_status_inactive">Inactivo</string>
 
@@ -678,7 +705,7 @@
     <string name="auto_withdraw_progress_completed">Enviado correctamente</string>
     <string name="auto_withdraw_progress_failed">El retiro ha fallado</string>
 
-    <string name="auto_withdraw_settings_title">Retiro automático</string>
+    <string name="auto_withdraw_settings_title">Retiro</string>
     <string name="auto_withdraw_error_title">Detalles del error</string>
 
     <!-- Settings - Withdrawals menu item -->
@@ -710,6 +737,9 @@
     <string name="withdraw_amount_placeholder">Introduce la cantidad en sats</string>
     <string name="withdraw_continue_button">Continuar</string>
     <string name="withdraw_scan_qr">Escanear QR</string>
+    <string name="withdraw_scan_invoice_button">Escanear factura</string>
+    <string name="withdraw_invoice_helper">Ingrese una factura Lightning BOLT11</string>
+    <string name="withdraw_address_helper">Enviar a una dirección tipo email Lightning</string>
     <string name="withdraw_section_send_to">Enviar a</string>
     <string name="withdraw_balance_available">Disponible: %1$s</string>
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index e19d202a..95be8f66 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -53,7 +53,13 @@
     <color name="empty_state_button_secondary_border">#4D9B9B9F</color>
     <color name="empty_state_close_icon">#FFFFFF</color>
 
+    <!-- Hero Green Tints (for mint selection hero card) -->
+    <color name="color_hero_green_border">#3300C244</color>
+    <color name="color_hero_green_tint">#1400C244</color>
+    <color name="color_default_pill_bg">#2600C244</color>
+
     <!-- Button Colors (Dark Mode) -->
     <color name="color_button_primary_pressed">#E0E0E0</color>
-    <color name="color_button_primary_disabled">#33FFFFFF</color>
+    <color name="color_button_primary_disabled">@color/color_bg_tertiary</color>
+    <color name="color_button_primary_text">#000000</color>
 </resources>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 9ce97b4f..54f52fd0 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -5,7 +5,7 @@
     <!-- Primary button with white background and black text in dark mode -->
     <style name="Widget.Button.Primary.Green">
         <item name="android:background">@drawable/bg_button_white</item>
-        <item name="android:textColor">#000000</item>
+        <item name="android:textColor">@color/color_button_primary_green_text</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">17sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 537b7d29..5964af3b 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -118,6 +118,16 @@
     <string name="onboarding_restore_wallet_title">Restaurar do backup</string>
     <string name="onboarding_restore_wallet_subtitle">Use sua frase semente existente</string>
 
+    <!-- Explainer -->
+    <string name="explainer_teaser_title">Como o Numo funciona?</string>
+    <string name="explainer_slide1_title">Toque para receber</string>
+    <string name="explainer_slide1_body">Digite um valor, toque em cobrar e seu cliente aproxima o telefone do seu. O pagamento chega instantaneamente por NFC.</string>
+    <string name="explainer_slide2_title">Auto-custdia automtica</string>
+    <string name="explainer_slide2_body">Configure o saque automtico para mover pagamentos recebidos diretamente para sua carteira Lightning. Numo  auto-custdia por padro.</string>
+    <string name="explainer_slide3_title">Zero taxas</string>
+    <string name="explainer_slide3_body">Numo  totalmente de cdigo aberto e no cobra taxas. Sem assinaturas, sem cortes, sem custos ocultos. Cada sat que voc recebe  seu.</string>
+    <string name="explainer_image_placeholder">Imagem de exemplo</string>
+
     <!-- Onboarding / Restore Seed Entry -->
     <string name="onboarding_seed_toolbar_back">Voltar</string>
     <string name="onboarding_seed_toolbar_title">Restaurar carteira</string>
@@ -158,6 +168,21 @@
     <string name="onboarding_mints_count">%1$d mint%2$s selecionado(s)</string>
     <string name="onboarding_mints_continue_restore">Restaurar carteira</string>
     <string name="onboarding_mints_continue_new_wallet">Continuar</string>
+    <string name="onboarding_mints_hero_label">MINT PADRÃO</string>
+    <string name="onboarding_mints_hero_subtitle">Guarda seu bitcoin</string>
+    <string name="onboarding_mints_hero_default_badge">Padrão</string>
+    <string name="onboarding_mints_hero_helper">Retire para sua própria carteira a qualquer momento, ou defina um limite de pagamento para fazê-lo automaticamente.</string>
+    <string name="onboarding_mints_accept_from_header">ACEITAR DE</string>
+    <string name="onboarding_mints_count_label">%1$d mints</string>
+    <string name="onboarding_mints_count_label_singular">%1$d mint</string>
+    <string name="onboarding_mints_status_accepting">Aceitando pagamentos</string>
+    <string name="onboarding_mints_status_not_accepting">Não aceitando</string>
+    <string name="onboarding_mints_long_press_hint">Mantenha pressionado um mint para definir como padrão</string>
+    <string name="onboarding_mints_add_new_button">+ Adicionar Novo Mint</string>
+    <string name="onboarding_mints_set_default_title">Definir como padrão?</string>
+    <string name="onboarding_mints_set_default_message">Tornar \"%1$s\" seu mint padrão?</string>
+    <string name="onboarding_mints_set_default_confirm">Definir como padrão</string>
+    <string name="onboarding_mints_set_default_cancel">Cancelar</string>
 
     <!-- Onboarding / Restoring -->
     <string name="onboarding_restoring_title">Restaurando carteira</string>
@@ -289,7 +314,7 @@
     <string name="withdraw_lightning_option_address">📧 Endereço Lightning</string>
     <string name="withdraw_lightning_address_hint_label">Insira um endereço Lightning</string>
     <string name="withdraw_lightning_address_hint_value">usuario@dominio.com</string>
-    <string name="withdraw_lightning_amount_label">Valor (sats)</string>
+    <string name="withdraw_lightning_amount_label">Valor</string>
     <string name="withdraw_lightning_amount_hint">1000</string>
     <string name="withdraw_lightning_button_continue">Continuar</string>
 
@@ -311,7 +336,7 @@
     <string name="withdraw_melt_amount_label">Valor</string>
     <string name="withdraw_melt_fee_label">Reserva de taxa</string>
     <string name="withdraw_melt_total_label">Total</string>
-    <string name="withdraw_melt_fee_note">A reserva de taxa será devolvida se a taxa real do Lightning for menor.</string>
+    <string name="withdraw_melt_fee_note">A reserva de taxa será devolvida se a taxa do Lightning for menor.</string>
     <string name="withdraw_melt_loading">Processando saque...</string>
 
     <!-- Withdraw - melt errors and states -->
@@ -634,8 +659,10 @@
 
     <!-- Auto-Withdraw Settings -->
     <string name="auto_withdraw_title">Saques</string>
+    <string name="auto_withdraw_hero_label">SAQUE AUTOMÁTICO</string>
     <string name="auto_withdraw_hero_title">Saque automático</string>
     <string name="auto_withdraw_hero_subtitle">Envie fundos automaticamente para sua carteira Lightning quando o saldo ultrapassar um limite</string>
+    <string name="auto_withdraw_hero_helper">Defina um limite de pagamento e um endereço Lightning para sacar automaticamente quando seu saldo atingir o limite.</string>
     <string name="auto_withdraw_status_active">Ativo</string>
     <string name="auto_withdraw_status_inactive">Inativo</string>
 
@@ -676,7 +703,7 @@
     <string name="auto_withdraw_progress_completed">Enviado com sucesso!</string>
     <string name="auto_withdraw_progress_failed">O saque falhou</string>
 
-    <string name="auto_withdraw_settings_title">Saque automático</string>
+    <string name="auto_withdraw_settings_title">Saque</string>
     <string name="auto_withdraw_error_title">Detalhes do erro</string>
 
     <!-- Settings - Withdrawals menu item -->
@@ -708,6 +735,9 @@
     <string name="withdraw_amount_placeholder">Insira o valor em sats</string>
     <string name="withdraw_continue_button">Continuar</string>
     <string name="withdraw_scan_qr">Escanear QR</string>
+    <string name="withdraw_scan_invoice_button">Escanear fatura</string>
+    <string name="withdraw_invoice_helper">Insira uma fatura Lightning BOLT11</string>
+    <string name="withdraw_address_helper">Enviar para um endereço Lightning tipo email</string>
     <string name="withdraw_section_send_to">Enviar para</string>
     <string name="withdraw_balance_available">Disponível: %1$s</string>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 767cb040..6113b757 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
     <!-- Numo Brand Colors -->
     <color name="numo_fluorescent_green">#5EFFC2</color>
     <color name="numo_navy">#0A2540</color>
+    <color name="numo_navy_light">#0E3050</color>
     
     <!-- Cash App Brand Colors -->
     <color name="color_primary_green">#0B1215</color>
@@ -67,6 +68,7 @@
     <color name="inputBoxStrokeColor">@color/color_divider</color>
     <color name="buttonBackground">@color/color_primary_green_light</color>
     <color name="buttonText">@color/color_bg_white</color>
+    <color name="color_button_primary_text">#FFFFFF</color>
     <color name="navigationBarBackground">#F8F9FA</color>
     <color name="navigationBarDivider">@color/color_divider</color>
     <color name="navigationIconTint">#757575</color>
@@ -103,7 +105,12 @@
     <color name="empty_state_button_secondary_border">#4D6F6F73</color>
     <color name="empty_state_close_icon">#000000</color>
 
+    <!-- Hero Green Tints (for mint selection hero card) -->
+    <color name="color_hero_green_border">#3300C244</color>
+    <color name="color_hero_green_tint">#1400C244</color>
+    <color name="color_default_pill_bg">#1A00C244</color>
+
     <!-- Button Colors (extracted from bg_button_primary_green.xml) -->
     <color name="color_button_primary_pressed">#1A2529</color>
-    <color name="color_button_primary_disabled">#33000000</color>
+    <color name="color_button_primary_disabled">@color/color_bg_tertiary</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a708de5c..16ac666d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -47,7 +47,7 @@
     <dimen name="text_section_header">13sp</dimen>
 
     <!-- Margins -->
-    <dimen name="margin_screen_horizontal">24dp</dimen>
+    <dimen name="margin_screen_horizontal">20dp</dimen>
     <dimen name="margin_screen_vertical">16dp</dimen>
     <dimen name="margin_content_horizontal">16dp</dimen>
 
@@ -68,10 +68,18 @@
     <dimen name="bottom_sheet_handle_width">36dp</dimen>
     <dimen name="bottom_sheet_handle_height">4dp</dimen>
 
-    <!-- Settings -->
+    <!-- Settings / Row Layout -->
     <dimen name="settings_item_height">56dp</dimen>
     <dimen name="settings_horizontal_padding">24dp</dimen>
     <dimen name="icon_button_size">44dp</dimen>
+    <dimen name="row_padding_vertical">14dp</dimen>
+    <dimen name="row_padding_horizontal">16dp</dimen>
+    <dimen name="row_icon_size">40dp</dimen>
+    <dimen name="row_icon_gap">14dp</dimen>
+    <dimen name="section_header_margin_bottom">14dp</dimen>
+    <dimen name="section_gap">28dp</dimen>
+    <dimen name="nav_back_size">36dp</dimen>
+    <dimen name="radius_button_pill">100dp</dimen>
 
     <!-- QR Scanner -->
     <dimen name="qr_viewfinder_size">280dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f5eb675f..0b56b373 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -113,18 +113,29 @@
 
     
     <string name="onboarding_setup_title">Set Up Your Wallet</string>
-    <string name="onboarding_setup_subtitle">Choose how you would like to get started</string>
+    <string name="onboarding_setup_subtitle">Choose how you\'d like to get started</string>
     <string name="onboarding_create_wallet_title">Create New Wallet</string>
     <string name="onboarding_create_wallet_subtitle">Start fresh with a new seed phrase</string>
-    <string name="onboarding_restore_wallet_title">Restore from Backup</string>
+    <string name="onboarding_restore_wallet_title">Restore From Backup</string>
     <string name="onboarding_restore_wallet_subtitle">Use your existing seed phrase</string>
 
+    <!-- Explainer -->
+    <string name="explainer_teaser_title">Tap. Pay. Done.</string>
+    <string name="explainer_teaser_subtitle">How does Numo work?</string>
+    <string name="explainer_slide1_title">Tap to get paid</string>
+    <string name="explainer_slide1_body">Enter an amount, tap charge, and your customer holds their phone to yours. Payment lands instantly over NFC.</string>
+    <string name="explainer_slide2_title">Automatic self-custody</string>
+    <string name="explainer_slide2_body">Set up auto-withdraw to move incoming payments straight to your own Lightning wallet.</string>
+    <string name="explainer_slide3_title">Zero fees</string>
+    <string name="explainer_slide3_body">Numo is fully open-source and charges no fees. No subscriptions, no cuts, no hidden costs. Every sat you receive is yours.</string>
+    <string name="explainer_image_placeholder">Image placeholder</string>
+
     
     <string name="onboarding_seed_toolbar_back">Back</string>
     <string name="onboarding_seed_toolbar_title">Restore Wallet</string>
-    <string name="onboarding_seed_instruction_title">Enter your 12-word seed phrase</string>
+    <string name="onboarding_seed_instruction_title">Enter your 12 word seed phrase</string>
     <string name="onboarding_seed_instruction_body">Enter the words in the correct order to restore your wallet.</string>
-    <string name="onboarding_seed_paste_button">Paste from Clipboard</string>
+    <string name="onboarding_seed_paste_button">Paste</string>
     <string name="onboarding_seed_validation_ready">Ready to continue</string>
     <string name="onboarding_seed_invalid_characters">Invalid characters detected</string>
     <string name="onboarding_seed_words_entered_count">%1$d of 12 words entered</string>
@@ -155,7 +166,7 @@
     <string name="onboarding_backup_not_found_subtitle">Using default mints</string>
     <string name="onboarding_mints_title">Select Mints</string>
     <string name="onboarding_mints_subtitle_restore">Select which mints to restore</string>
-    <string name="onboarding_mints_subtitle_description">These mints will hold your bitcoin. You can withdraw to your own wallet at any time, or set a payout threshold to do it automatically.</string>
+    <string name="onboarding_mints_subtitle_description">This mint will hold your bitcoin. You can withdraw to your own wallet at any time, or set a payout threshold to do it automatically.</string>
     <string name="onboarding_mints_count">%1$d mint%2$s selected</string>
     <string name="onboarding_mints_continue_restore">Restore Wallet</string>
     <string name="onboarding_mints_continue_new_wallet">Continue</string>
@@ -164,8 +175,33 @@
     <string name="onboarding_mints_scan_row_title">Scan QR Code</string>
     <string name="onboarding_mints_scan_row_subtitle">Tap to scan an address</string>
     <string name="onboarding_mint_generic_name">Mint</string>
+    <string name="onboarding_mints_default_section_title">Default Mint</string>
+    <string name="onboarding_mints_popular_section_title">Popular Mints</string>
+    <string name="onboarding_mints_popular_section_subtitle">Accept ecash from these mints</string>
+    <string name="onboarding_mints_add_different_button">+ New Mint</string>
+    <string name="onboarding_mints_hero_label">DEFAULT MINT</string>
+    <string name="onboarding_mints_hero_subtitle">Holds your bitcoin</string>
+    <string name="onboarding_mints_hero_default_badge">Default</string>
+    <string name="onboarding_mints_hero_helper">Withdraw to your own wallet anytime, or set a payout threshold to do it automatically.</string>
+    <string name="onboarding_mints_accept_from_header">ACCEPT FROM</string>
+    <string name="onboarding_mints_count_label">%1$d mints</string>
+    <string name="onboarding_mints_count_label_singular">%1$d mint</string>
+    <string name="onboarding_mints_status_accepting">Accepting payments</string>
+    <string name="onboarding_mints_status_not_accepting">Not accepting</string>
+    <string name="onboarding_mints_long_press_hint">Long press a mint to set as default</string>
+    <string name="onboarding_mints_add_new_button">+ Add New Mint</string>
+    <string name="onboarding_mints_set_default_title">Set as Default?</string>
+    <string name="onboarding_mints_set_default_message">Make \"%1$s\" your default mint?</string>
+    <string name="onboarding_mints_set_default_confirm">Set as Default</string>
+    <string name="onboarding_mints_set_default_cancel">Cancel</string>
+    <string name="onboarding_add_mint_sheet_title">Add a Mint</string>
+    <string name="onboarding_add_mint_url_hint">Enter mint URL</string>
+    <string name="onboarding_add_mint_button">Add</string>
+    <string name="onboarding_add_mint_or">or</string>
+    <string name="onboarding_add_mint_scan_qr">Scan</string>
+    <string name="onboarding_add_mint_loading">Adding mint…</string>
+
 
-    
     <string name="onboarding_restoring_title">Restoring Wallet</string>
     <string name="onboarding_restoring_initializing">Initializing restore...</string>
 
@@ -176,7 +212,7 @@
     <string name="onboarding_success_created_title">Wallet Created</string>
     <string name="onboarding_success_created_subtitle">Your wallet is ready to use</string>
     <string name="onboarding_success_balance_by_mint">BALANCE BY MINT</string>
-    <string name="onboarding_enter_wallet_button">Enter Wallet</string>
+    <string name="onboarding_enter_wallet_button">Continue</string>
 
     
     <string name="onboarding_error_creating_wallet">Error creating wallet: %1$s</string>
@@ -330,7 +366,7 @@ Last updated: November 2024</string>
     <string name="withdraw_lightning_option_address">📧 Lightning Address</string>
     <string name="withdraw_lightning_address_hint_label">Enter a Lightning address</string>
     <string name="withdraw_lightning_address_hint_value">user@domain.com</string>
-    <string name="withdraw_lightning_amount_label">Amount (sats)</string>
+    <string name="withdraw_lightning_amount_label">Amount</string>
     <string name="withdraw_lightning_amount_hint">1000</string>
     <string name="withdraw_lightning_button_continue">Continue</string>
 
@@ -352,7 +388,7 @@ Last updated: November 2024</string>
     <string name="withdraw_melt_amount_label">Amount</string>
     <string name="withdraw_melt_fee_label">Fee Reserve</string>
     <string name="withdraw_melt_total_label">Total</string>
-    <string name="withdraw_melt_fee_note">The fee reserve will be returned if the actual Lightning fee is lower.</string>
+    <string name="withdraw_melt_fee_note">The fee reserve will be returned if the Lightning fee is lower.</string>
     <string name="withdraw_melt_loading">Processing withdrawal...</string>
 
     
@@ -679,8 +715,10 @@ Last updated: November 2024</string>
 
     
     <string name="auto_withdraw_title">Withdrawals</string>
+    <string name="auto_withdraw_hero_label">AUTO-WITHDRAW</string>
     <string name="auto_withdraw_hero_title">Auto-Withdraw</string>
     <string name="auto_withdraw_hero_subtitle">Automatically send funds to your Lightning wallet when balance exceeds a threshold</string>
+    <string name="auto_withdraw_hero_helper">Set a payout threshold and lightning address to automatically withdraw when your balance reaches the limit.</string>
     <string name="auto_withdraw_status_active">Active</string>
     <string name="auto_withdraw_status_inactive">Inactive</string>
     
@@ -721,7 +759,7 @@ Last updated: November 2024</string>
     <string name="auto_withdraw_progress_completed">Sent successfully!</string>
     <string name="auto_withdraw_progress_failed">Withdrawal failed</string>
     
-    <string name="auto_withdraw_settings_title">Auto-Withdraw</string>
+    <string name="auto_withdraw_settings_title">Withdraw</string>
     <string name="auto_withdraw_error_title">Error Details</string>
 
     
@@ -753,6 +791,9 @@ Last updated: November 2024</string>
     <string name="withdraw_amount_placeholder">Enter amount in sats</string>
     <string name="withdraw_continue_button">Continue</string>
     <string name="withdraw_scan_qr">Scan QR</string>
+    <string name="withdraw_scan_invoice_button">Scan Invoice</string>
+    <string name="withdraw_invoice_helper">Enter a BOLT11 lightning invoice</string>
+    <string name="withdraw_address_helper">Send to an email-like lightning address</string>
     <string name="withdraw_section_send_to">Send To</string>
     <string name="withdraw_balance_available">Available: %1$s</string>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c3334c4e..310d5dc4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,16 +28,48 @@
         <item name="android:lineHeight">22sp</item>
         <item name="android:textColor">@color/color_text_primary</item>
         <item name="android:gravity">center</item>
+        <item name="android:letterSpacing">-0.012</item>
     </style>
 
     <style name="Text.SectionHeader">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textSize">13sp</item>
-        <item name="android:textColor">@color/color_text_tertiary</item>
-        <item name="android:letterSpacing">0.05</item>
+        <item name="android:textColor">@color/color_text_secondary</item>
+        <item name="android:letterSpacing">0.06</item>
         <item name="android:textAllCaps">true</item>
     </style>
 
+    <style name="Text.RowTitle">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">@color/color_text_primary</item>
+        <item name="android:letterSpacing">-0.007</item>
+    </style>
+
+    <style name="Text.RowSubtitle">
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:textColor">@color/color_text_tertiary</item>
+    </style>
+
+    <style name="Text.Helper">
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:textColor">@color/color_text_tertiary</item>
+    </style>
+
+    <style name="Text.SecondaryButton">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/color_text_secondary</item>
+    </style>
+
+    <style name="Text.Badge">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textSize">11sp</item>
+        <item name="android:letterSpacing">0.03</item>
+    </style>
+
     <style name="Text.Body">
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textSize">15sp</item>
@@ -61,8 +93,8 @@
 
     <style name="Text.Button">
         <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">17sp</item>
-        <item name="android:letterSpacing">0.01</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:letterSpacing">-0.012</item>
         <item name="android:gravity">center</item>
     </style>
 
@@ -88,10 +120,11 @@
     <!-- Component Styles -->
     <style name="Widget.Button.Primary.Green">
         <item name="android:background">@drawable/bg_button_primary_green</item>
-        <item name="android:textColor">@color/color_bg_white</item>
+        <item name="android:textColor">@color/color_button_primary_green_text</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">17sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:letterSpacing">-0.012</item>
         <item name="android:minHeight">52dp</item>
         <item name="android:paddingStart">24dp</item>
         <item name="android:paddingEnd">24dp</item>
@@ -102,11 +135,11 @@
 
     <style name="Widget.Button.Secondary.Outlined">
         <item name="android:background">@drawable/bg_button_secondary_outlined</item>
-        <item name="android:textColor">@color/color_text_primary</item>
+        <item name="android:textColor">@color/color_text_secondary</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">17sp</item>
+        <item name="android:textSize">14sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:minHeight">52dp</item>
+        <item name="android:minHeight">48dp</item>
         <item name="android:paddingStart">24dp</item>
         <item name="android:paddingEnd">24dp</item>
         <item name="android:stateListAnimator">@null</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 429eb08b..f704be01 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -28,6 +28,8 @@
         <item name="colorOnSurface">@color/color_text_primary</item>
         <!-- Icon tint -->
         <item name="colorControlNormal">@color/color_text_secondary</item>
+        <!-- Switch/toggle active color -->
+        <item name="colorControlActivated">@color/color_success_green</item>
         <!-- Popup menu styling -->
         <item name="popupMenuStyle">@style/Widget.Numo.PopupMenu</item>
         <item name="android:popupMenuStyle">@style/Widget.Numo.PopupMenu</item>
@@ -103,6 +105,7 @@
     
     <!-- Apple-style Bottom Sheet Fragment Theme -->
     <style name="Theme.Numo.BottomSheet" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+        <item name="colorPrimary">@color/color_primary_green_light</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:backgroundDimAmount">0.4</item>
diff --git a/app/src/test/java/com/electricdreams/numo/feature/onboarding/OnboardingActivityTest.kt b/app/src/test/java/com/electricdreams/numo/feature/onboarding/OnboardingActivityTest.kt
index 9d60876a..25705b26 100644
--- a/app/src/test/java/com/electricdreams/numo/feature/onboarding/OnboardingActivityTest.kt
+++ b/app/src/test/java/com/electricdreams/numo/feature/onboarding/OnboardingActivityTest.kt
@@ -1,15 +1,11 @@
 package com.electricdreams.numo.feature.onboarding
 
 import android.view.View
-import android.widget.EditText
 import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.electricdreams.numo.R
-import com.electricdreams.numo.ui.components.AddMintInputCard
 import com.google.android.material.button.MaterialButton
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -86,116 +82,6 @@ class OnboardingActivityTest {
         }
     }
 
-    @Test
-    fun `review mint row renders name only with no visible URL subtitle`() {
-        ActivityScenario.launch(OnboardingActivity::class.java).use { scenario ->
-            scenario.onActivity { activity ->
-                val discovered =
-                    ReflectionHelpers.getField<LinkedHashSet<String>>(activity, "discoveredMints")
-                val selected =
-                    ReflectionHelpers.getField<LinkedHashSet<String>>(activity, "selectedMints")
-                val names = ReflectionHelpers.getField<MutableMap<String, String>>(
-                    activity,
-                    "onboardingMintDisplayNames"
-                )
-                discovered.clear()
-                selected.clear()
-                names.clear()
-
-                val mintUrl = "https://mint.coinos.io"
-                discovered.add(mintUrl)
-                selected.add(mintUrl)
-                names[mintUrl] = "Coinos"
-
-                ReflectionHelpers.callInstanceMethod<Unit>(activity, "updateReviewMintsUI")
-
-                val list = activity.findViewById<LinearLayout>(R.id.mints_list_container)
-                assertEquals(1, list.childCount)
-
-                val rowTexts = extractTextValues(list.getChildAt(0))
-                assertTrue(rowTexts.contains("Coinos"))
-                assertFalse(rowTexts.any { it.contains("coinos.io", ignoreCase = true) })
-            }
-        }
-    }
-
-    @Test
-    fun `review screen includes add different mint card`() {
-        ActivityScenario.launch(OnboardingActivity::class.java).use { scenario ->
-            scenario.onActivity { activity ->
-                val addCard = activity.findViewById<AddMintInputCard>(R.id.add_different_mint_card)
-                assertNotNull(addCard)
-            }
-        }
-    }
-
-    @Test
-    fun `review subtitle uses updated bitcoin custody copy`() {
-        ActivityScenario.launch(OnboardingActivity::class.java).use { scenario ->
-            scenario.onActivity { activity ->
-                val subtitle = activity.findViewById<TextView>(R.id.mints_subtitle)
-                assertEquals(
-                    "These mints will hold your bitcoin. You can withdraw to your own wallet at any time, or set a payout threshold to do it automatically.",
-                    subtitle.text.toString()
-                )
-            }
-        }
-    }
-
-    @Test
-    fun `onboarding add mint card uses onboarding presentation mode`() {
-        ActivityScenario.launch(OnboardingActivity::class.java).use { scenario ->
-            scenario.onActivity { activity ->
-                val addCard = activity.findViewById<AddMintInputCard>(R.id.add_different_mint_card)
-
-                val helperText = addCard.findViewById<TextView>(R.id.helper_text)
-                val urlInput = addCard.findViewById<EditText>(R.id.url_input)
-                val inlineScan = addCard.findViewById<ImageButton>(R.id.scan_button)
-                val scanRow = addCard.findViewById<View>(R.id.scan_row_container)
-                val scanRowTitle = addCard.findViewById<TextView>(R.id.scan_row_title)
-                val scanRowSubtitle = addCard.findViewById<TextView>(R.id.scan_row_subtitle)
-                val addButton = addCard.findViewById<TextView>(R.id.add_button)
-
-                assertEquals(View.GONE, helperText.visibility)
-                assertEquals("Enter mint address", urlInput.hint.toString())
-                assertEquals(View.GONE, inlineScan.visibility)
-                assertEquals(View.VISIBLE, scanRow.visibility)
-                assertEquals("Scan QR Code", scanRowTitle.text.toString())
-                assertEquals("Tap to scan an address", scanRowSubtitle.text.toString())
-                assertEquals(activity.getColor(R.color.color_text_primary), addButton.currentTextColor)
-            }
-        }
-    }
-
-    @Test
-    fun `mints count reflects single selected mint in review`() {
-        ActivityScenario.launch(OnboardingActivity::class.java).use { scenario ->
-            scenario.onActivity { activity ->
-                val discovered =
-                    ReflectionHelpers.getField<LinkedHashSet<String>>(activity, "discoveredMints")
-                val selected =
-                    ReflectionHelpers.getField<LinkedHashSet<String>>(activity, "selectedMints")
-                val names = ReflectionHelpers.getField<MutableMap<String, String>>(
-                    activity,
-                    "onboardingMintDisplayNames"
-                )
-                discovered.clear()
-                selected.clear()
-                names.clear()
-
-                val mintUrl = "https://mint.coinos.io"
-                discovered.add(mintUrl)
-                selected.add(mintUrl)
-                names[mintUrl] = "Coinos"
-
-                ReflectionHelpers.callInstanceMethod<Unit>(activity, "updateReviewMintsUI")
-
-                val countText = activity.findViewById<TextView>(R.id.mints_count_text).text.toString()
-                assertTrue(countText.contains("1 mint"))
-            }
-        }
-    }
-
     @Test
     fun `add different mint with invalid URL does not modify list`() {
         ActivityScenario.launch(OnboardingActivity::class.java).use { scenario ->
@@ -293,24 +179,6 @@ class OnboardingActivityTest {
         }
     }
 
-    private fun extractTextValues(view: View): List<String> {
-        val values = mutableListOf<String>()
-        when (view) {
-            is TextView -> values.add(view.text.toString())
-            is LinearLayout -> {
-                for (i in 0 until view.childCount) {
-                    values.addAll(extractTextValues(view.getChildAt(i)))
-                }
-            }
-            is FrameLayout -> {
-                for (i in 0 until view.childCount) {
-                    values.addAll(extractTextValues(view.getChildAt(i)))
-                }
-            }
-        }
-        return values
-    }
-
     private fun waitForCondition(
         scenario: ActivityScenario<OnboardingActivity>,
         timeoutMs: Long,
diff --git a/docs/SwapToLightningMint.md b/docs/SwapToLightningMint.md
deleted file mode 100644
index 546efcc7..00000000
--- a/docs/SwapToLightningMint.md
+++ /dev/null
@@ -1,858 +0,0 @@
-# SwapToLightningMint Design Plan
-
-## 0. Goal / Overview
-
-Allow the POS to **accept ecash from any reachable mint**, even if that mint is _not_ in the merchant's configured allowed‑mints list, by:
-
-1. Detecting that the payer is using an unknown mint.
-2. Treating the unknown mint purely as a **temporary source** of liquidity.
-3. Melting the payer's ecash at that mint to pay a **Lightning invoice generated from the POS’s configured Lightning mint**.
-4. Verifying that the payment succeeded and that the preimage from the unknown mint’s melt matches the Lightning invoice’s payment hash.
-
-The merchant ultimately receives funds on their **Lightning mint** only; the payer’s unknown mint is used only as an intermediate bridge.
-
-This plan is now aligned with the **implemented code** in the app. Where relevant,
-we reference concrete classes and methods.
-
----
-
-## 1. Current Relevant Architecture & Flows
-
-### 1.1. Cashu token validation & redemption
-
-**File:** `app/src/main/java/com/electricdreams/numo/ndef/CashuPaymentHelper.kt`
-
-Key parts:
-
-- `isCashuToken(text: String?)`: checks for `cashuA` / `cashuB` prefix.
-- `validateToken(tokenString, expectedAmount, allowedMints)`:
-  - Decodes `org.cashudevkit.Token`.
-  - Ensures `unit == CurrencyUnit.Sat`.
-  - If `allowedMints` is not empty, checks that `token.mintUrl().url` is in `allowedMints`. **Currently rejects tokens from unknown mints.**
-  - Checks that `token.value().value >= expectedAmount`.
-- `redeemToken(tokenString: String?)`:
-  - Gets `MultiMintWallet` via `CashuWalletManager.getWallet()`.
-  - Decodes token with `org.cashudevkit.Token.decode(...)`.
-  - Derives mint URL and then calls CDK wallet to **receive** the token.
-
-There is also `redeemFromPRPayload(...)` for Nostr/Cashu payloads; it similarly enforces allowed mints and then redeems via a temporary JDK token.
-
-### 1.2. Wallet & mint management (MultiMint + temporary single-mint)
-
-**File:** `app/src/main/java/com/electricdreams/numo/core/cashu/CashuWalletManager.kt`
-
-- Manages the app’s **primary `MultiMintWallet`** and its on-disk `WalletSqliteDatabase`.
-- Registers only **allowed mints** when building the wallet (`rebuildWallet`).
-- Exposes helpers:
-  - `getWallet(): MultiMintWallet?`
-  - `getBalanceForMint(mintUrl: String): Long`
-  - `getAllMintBalances(): Map<String, Long>`
-  - `fetchMintInfo(mintUrl: String): MintInfo?` (wraps `wallet.fetchMintInfo(MintUrl)` – used for reachability checks).
-- **New (for SwapToLightningMint):**
-  - `suspend fun getTemporaryWalletForMint(unknownMintUrl: String): Wallet`
-
-This new method constructs a **temporary, single-mint `Wallet`** instance that:
-
-- Uses a **fresh random mnemonic** (isolated from the main POS wallet seed).
-- Uses an **ephemeral in-memory database** via `WalletDatabaseImpl(NoPointer)`.
-- Is bound to a **single mint URL** (`unknownMintUrl`).
-
-This separation implements the design requirement that:
-
-> The other is a temporary single-mint Wallet instantiated with the unknown mint. It must not use the app's main seed phrase.
-
-### 1.3. Lightning mint management
-
-**Files:**
-
-- `app/src/main/java/com/electricdreams/numo/core/util/MintManager.kt`
-- `app/src/main/java/com/electricdreams/numo/payment/LightningMintHandler.kt`
-
-`MintManager`:
-
-- Holds the list of **allowed mints** and the **preferred Lightning mint** (single source of truth).
-- Ensures that the preferred Lightning mint is always one of the allowed mints.
-
-`LightningMintHandler`:
-
-- Drives the **receive‑over‑Lightning** flow for a selected Lightning mint.
-- `start(paymentAmount: Long, callback: Callback)`:
-  - Gets wallet (`MultiMintWallet`).
-  - Fetches preferred Lightning mint URL from `MintManager`.
-  - Calls `wallet.mintQuote(mintUrl, CdkAmount(paymentAmount), memo)`.
-  - Yields a BOLT11 invoice + quote ID via `callback.onInvoiceReady(bolt11, quote.id, mintUrlStr)`.
-  - Starts WebSocket subscription + polling to wait for quote to be **paid**; then calls `wallet.mintWithMint(mintUrl, quoteId)` and finalizes by crediting proofs to the wallet.
-
-So, this already gives us a good pattern for:
-
-- **Obtaining a Lightning invoice** from the Lightning mint (via mint quote).
-- **Monitoring its payment** and then **minting** proofs when paid.
-
-### 1.4. Lightning melts (withdrawals via Lightning) – existing patterns
-
-**Files:**
-
-- `app/src/main/java/com/electricdreams/numo/feature/settings/WithdrawLightningActivity.kt`
-- `app/src/main/java/com/electricdreams/numo/feature/settings/WithdrawMeltQuoteActivity.kt`
-- `app/src/main/java/com/electricdreams/numo/feature/autowithdraw/AutoWithdrawManager.kt`
-
-These show how we already use the CDK **MultiMintWallet** for melt operations:
-
-- `wallet.meltQuote(MintUrl(mintUrl), invoice, null)` – withdraw to a **Lightning invoice**.
-- `wallet.meltLightningAddressQuote(MintUrl(mintUrl), lightningAddress, amountMsat)` – withdraw to a Lightning address.
-- `wallet.meltWithMint(MintUrl(mintUrl), meltQuote.id)` – execute the melt.
-- `wallet.checkMeltQuote(MintUrl(mintUrl), meltQuote.id)` – get final state; `QuoteState.PAID` means invoice paid.
-
-In the **implemented SwapToLightningMint flow**, we follow a slightly different pattern:
-
-- For the **temporary single-mint `Wallet`** (bound to `unknownMintUrl`):
-  - Use `wallet.meltQuote(bolt11, options)` to obtain a melt quote **without** going through MultiMintWallet.
-  - Use `wallet.melt(quoteId)` to actually execute the melt.
-- For the **primary `MultiMintWallet`**:
-  - Use `multiMintWallet.mintQuote(lightningMintUrl, amount, memo)` to obtain the Lightning mint quote.
-  - Use `multiMintWallet.checkMeltQuote(MintUrl(unknownMintUrl), meltQuote.id)` to check the canonical state and preimage from the unknown mint.
-
-This pattern is exactly what we need, except the **payer’s mint is potentially not in our allowed list**.
-
-### 1.5. HCE payment flow (NDEF Cashu)
-
-**Files:**
-
-- `app/src/main/java/com/electricdreams/numo/PaymentRequestActivity.kt`
-- `app/src/main/java/com/electricdreams/numo/ndef/NdefHostCardEmulationService.java`
-
-Key points:
-
-- `PaymentRequestActivity.setupNdefPayment()`:
-  - Configures HCE service with a Cashu payment request (`CashuPaymentHelper.createPaymentRequest`).
-  - Registers `CashuPaymentCallback`.
-- `NdefHostCardEmulationService` on token receive:
-  - Extracts Cashu token from APDU payload using `CashuPaymentHelper.extractCashuToken`.
-  - Calls `CashuPaymentHelper.validateToken(cashuToken, expectedAmount, allowedMints)`.
-  - If valid, calls `CashuPaymentHelper.redeemToken(cashuToken)`.
-  - On success: `onCashuTokenReceived(redeemedToken)` -> `PaymentRequestActivity.handlePaymentSuccess(token)`.
-
-So in current behavior:
-
-- **Unknown mint → `validateToken()` fails → we error out and the payment fails.**
-
-Swap‑to‑Lightning‑mint should kick in right at this decision point.
-
----
-
-## 2. New Concept: "SwapToLightningMint" Flow
-
-### 2.1. High‑level idea (updated with two-wallet architecture)
-
-When a Cashu token is presented from a mint **not in our allowed list**, we:
-
-1. Use a **temporary single-mint `Wallet`** bound to the unknown mint to **request a melt quote** for our Lightning invoice.
-2. Validate that the quoted **fee reserve <= 5%** and that the **quoted amount** covers the expected POS amount.
-3. Use our primary **`MultiMintWallet`** to obtain (or reuse) a **Lightning mint quote** and BOLT11 invoice for the POS amount.
-4. **Persist a SwapToLightningMint “frame”** on the pending `PaymentHistoryEntry`, tying together:
-   - `unknownMintUrl`
-   - the unknown-mint `meltQuoteId`
-   - `lightningMintUrl`
-   - the Lightning-mint `lightningQuoteId`.
-5. Execute the **melt** on the unknown mint using the temporary `Wallet`.
-6. Use the **MultiMintWallet** to check the canonical melt quote state (`checkMeltQuote`) and obtain `paymentPreimage`.
-7. Verify that `SHA256(preimage) == payment_hash(bolt11)`.
-8. Once verified, we rely on the existing Lightning mint flow to mint proofs and treat the POS payment as successful.
-
-### 2.2. Responsibilities
-
-- **Payer’s unknown mint**: burns their ecash and pays the Lightning invoice we control.
-- **Our Lightning mint**: issues us new ecash that we credit to the merchant wallet.
-- **POS app**: orchestrates both sides (invoice generation at Lightning mint + melt at unknown mint) and ensures cryptographic linkage via preimage verification.
-
----
-
-### 3. Phase‑by‑Phase Design (Per Requirements, updated)
-
-### Phase 1 – Detect Unknown Mint
-
-**Current behavior:**
-
-```kotlin
-if (!allowedMints.isNullOrEmpty()) {
-    val mintUrl = token.mintUrl().url
-    if (!allowedMints.contains(mintUrl)) {
-        Log.e(TAG, "Mint not in allowed list: $mintUrl")
-        return false
-    }
-}
-```
-
-**Change:** Instead of immediately failing, we:
-
-1. Extract `mintUrl` from the token.
-2. If `mintUrl` is **not** in `allowedMints`, we branch into a new flow:
-   - `SwapToLightningMintManager.swapFromUnknownMint(token, expectedAmount, mintUrl, allowedMints)` (working name),
-   - or a new method inside `CashuPaymentHelper` that encapsulates this behavior.
-
-For `NdefHostCardEmulationService`, we must update the flow so that when `validateToken(...)` indicates "unknown mint" we **do not immediately call `onCashuPaymentError`**, but instead try swapping.
-
-Implementation detail:
-
-- Introduce a structured result type for validation, e.g.:
-
-  ```kotlin
-  sealed class TokenValidationResult {
-      object InvalidFormat : TokenValidationResult()
-      data class ValidKnownMint(val token: org.cashudevkit.Token) : TokenValidationResult()
-      data class ValidUnknownMint(val token: org.cashudevkit.Token, val mintUrl: String) : TokenValidationResult()
-      data class InsufficientAmount(val required: Long, val actual: Long) : TokenValidationResult()
-  }
-  ```
-
-- `validateToken(...)` returns `TokenValidationResult` instead of `Boolean`, so the caller can branch to **swap** when it sees `ValidUnknownMint`.
-
-### Phase 2 – Obtain / Reuse Invoice from Lightning Mint (MultiMintWallet)
-
-We need a **Lightning invoice** from our configured **Lightning mint** for `expectedAmount` sats (or possibly `expectedAmount` plus a small buffer if needed).
-
-We already have a robust implementation:
-
-- `LightningMintHandler.start(paymentAmount: Long, callback: Callback)` → uses `wallet.mintQuote(mintUrl, amount, memo)` to get:
-  - `quote.id`
-  - `quote.request` (BOLT11)
-
-For SwapToLightningMint we need (and have implemented):
-
-- A **programmatic / non‑UI** way to:
-  1. Get the Lightning mint URL from `MintManager`.
-  2. Request a `mintQuote` for the exact amount we want to receive (`expectedAmount`).
-  3. Cache this **per payment** so that:
-     - If we get multiple attempts from different unknown mints for the same POS payment, we reuse the same quote and invoice.
-
-Design:
-
-- Introduce a small coordinator class – e.g.
-
-  ```kotlin
-  data class LightningMintInvoice(
-      val bolt11: String,
-      val quoteId: String,
-      val lightningMintUrl: String
-  )
-
-  object LightningMintInvoiceManager {
-      suspend fun getOrCreateInvoiceForPayment(paymentId: String, amountSats: Long): LightningMintInvoice { /* ... */ }
-  }
-  ```
-
-- This manager can:
-  - Check existing `PaymentHistoryEntry` / pending payment data for a stored `lightningQuoteId` and invoice.
-  - If not present, use `MultiMintWallet.mintQuote` (via something similar to `LightningMintHandler` but without UI callbacks) to create a new quote; persist `(quoteId, bolt11, mintUrl)` associated with `paymentId`.
-
-This re‑use is aligned with the requirement "or get it if we already fetched it before for this payment" and is implemented by `LightningMintInvoiceManager.getOrCreateInvoiceForPayment`.
-
-### Phase 3 – Request Melt Quote from Unknown Mint (Temporary Wallet)
-
-### Phase 4 – Request Melt Quote from Unknown Mint
-
-Using the **temporary single-mint `Wallet`**:
-
-```kotlin
-val tempWallet = CashuWalletManager.getTemporaryWalletForMint(unknownMintUrl)
-val meltQuote = tempWallet.meltQuote(bolt11Invoice, null)
-```
-
-We then have:
-
-- `meltQuote.amount` – the amount being paid (in sats).
-- `meltQuote.feeReserve` – the fee reserve held by the mint.
-- `meltQuote.id` – the **local quote ID** used later by `tempWallet.melt(meltQuote.id)`.
-
-This matches your requirement:
-
-> 1. We get a meltQuote from the temp wallet (verify lightning fee reserve does not exceed 5%)
-
-### Phase 4 – Verify Fee Reserve ≤ 5%
-
-We must check that the fee reserve is reasonable:
-
-- Compute `feePercent = feeReserve / amount`.
-- Reject if `feePercent > 0.05` (5%).
-
-Pseudo‑code:
-
-```kotlin
-val quoteAmount = meltQuote.amount.value.toLong()
-val feeReserve = meltQuote.feeReserve.value.toLong()
-
-if (quoteAmount <= 0) {
-    throw Exception("Invalid melt quote: amount is zero")
-}
-
-val feeRatio = feeReserve.toDouble() / quoteAmount.toDouble()
-if (feeRatio > 0.05) {
-    throw Exception("Melt fee reserve too high: ${feeRatio * 100}% (max 5%)")
-}
-```
-
-If rejected, we:
-
-- Surface to the cashier that the payer’s mint wants too high a fee.
-- Do **not** proceed with the melt.
-
-### Phase 5 – Persist Swap Frame + Execute Melt and Verify Preimage
-
-#### 5.1. Persist SwapToLightningMint frame on PaymentHistory
-
-We extend `PaymentHistoryEntry` with a JSON field:
-
-```kotlin
-@SerializedName("swapToLightningMintJson")
-val swapToLightningMintJson: String? = null
-```
-
-and a DTO:
-
-```kotlin
-data class SwapToLightningMintFrame(
-    val unknownMintUrl: String,
-    val meltQuoteId: String,
-    val lightningMintUrl: String,
-    val lightningQuoteId: String,
-)
-```
-
-This frame is written from `SwapToLightningMintManager` using
-`PaymentsHistoryActivity.updatePendingWithLightningInfo`, which now
-accepts an optional `swapToLightningMintJson` argument.
-
-#### 5.2. Execute melt via temporary Wallet
-
-With the `meltQuote` obtained from the temporary wallet, we execute:
-
-```kotlin
-tempWallet.melt(meltQuote.id)
-```
-
-This calls the **single-mint `Wallet.melt(quoteId)`** API, which
-actually pays the Lightning invoice using the unknown mint.
-
-#### 5.3. Fetch final melt quote & preimage via MultiMintWallet
-
-After executing the melt, we rely on our **primary MultiMintWallet**
-to obtain the canonical final state and preimage for the melt quote:
-
-```kotlin
-val mainWallet = CashuWalletManager.getWallet() ?: error("Wallet not initialized")
-val finalQuote = mainWallet.checkMeltQuote(MintUrl(unknownMintUrl), meltQuote.id)
-
-if (finalQuote.state != QuoteState.PAID) {
-    throw Exception("Unknown-mint melt did not complete: state=${finalQuote.state}")
-}
-
-val preimageHex = finalQuote.paymentPreimage
-    ?: throw Exception("Unknown-mint melt quote is PAID but has no paymentPreimage")
-```
-
-This matches your requirement:
-
-> 4. We execute the melt from the temp wallet.
-> 5. We check the payment hash matches sha256(pre-image) with the returned pre-image.
-
-#### 5.4. Obtain preimage from the unknown mint (final quote)
-
-The requirement states:
-
-> When successful, we verify the payment pre-image provided in the melt quote response from the unknown mint we melted from. That pre-image should hash to the image obtained from the bolt11 invoice.
-
-We will need to:
-
-- Confirm via CDK FFI types in `cdk_ffi.kt` how preimages are exposed in `MeltQuote` / `MeltQuoteState` / `Melted` type (e.g. some field like `preimage`, `paymentPreimage` or inside a `LightningPayment` struct).
-- Plan: once `finalQuote.state == PAID`, read `finalQuote.preimage` (or equivalent). If not available in `checkMeltQuote`, it may be present on the `melted` result; otherwise, we may have to update CDK or the Kotlin bindings.
-
-#### 5.5. Extract payment hash from the BOLT11 invoice
-
-We must also extract the payment hash (image) from the BOLT11 invoice used in the quote.
-
-Design options:
-
-1. **Use Lightning parsing in CDK** if available.
-2. If not, add a small BOLT11 parsing helper (library or custom) on Android side that at least extracts the payment hash.
-
-Either way, we need a utility:
-
-```kotlin
-fun getPaymentHashFromInvoice(bolt11: String): ByteArray { /* ... */ }
-```
-
-#### 6.4. Verify preimage → payment hash
-
-Once we have:
-
-- `preimage: ByteArray` from the unknown mint, and
-- `paymentHash: ByteArray` from `bolt11`,
-
-we compute:
-
-```kotlin
-val sha256Digest = MessageDigest.getInstance("SHA-256")
-val computedHash = sha256Digest.digest(preimage)
-
-if (!computedHash.contentEquals(paymentHash)) {
-    throw Exception("Invalid payment preimage: does not match invoice hash")
-}
-```
-
-Only if the hashes match and `finalQuote.state == QuoteState.PAID` do we consider the Lightning payment as successfully funded by the unknown mint.
-
-#### 6.5. Ensure that our Lightning mint mints proofs
-
-The overall sequence should be:
-
-1. Lightning mint issues invoice (via `mintQuote`).
-2. Unknown mint pays invoice by melting payer’s ecash.
-3. The Lightning mint, once it sees the LN payment succeed, marks the quote as **paid**.
-4. Our app should:
-   - Either let `LightningMintHandler` continue to monitor the quote and call `mintWithMint` when it sees `paid`, or
-   - Integrate the swap flow with `LightningMintHandler` so it is the single orchestrator:
-     - It already does WebSocket + polling and final `mintWithMint`.
-
-Design decision:
-
-- **Recommended:** reuse `LightningMintHandler` logic rather than replicate it.
-- That means our swap flow will:
-  - Create or reuse a Lightning mint quote (and attach `LightningMintHandler` to it).
-  - Use the `bolt11` from that quote as the `request` for the unknown‑mint melt.
-  - Wait until both:
-    - Unknown mint melt is `PAID` **and** preimage matches invoice hash.
-    - Lightning mint quote is `PAID` and `mintWithMint` has been executed.
-
-**Practical simplification:** For the POS, we may treat "unknown mint melt succeeded and preimage matches hash" as sufficient, trusting that the Lightning mint will deliver proofs or the operator can reconcile later. But for a robust design, we should keep the Lightning‑mint side in sync.
-
-For this first iteration of the plan, we define **required** correctness as:
-
-- Unknown mint melt `PAID` + preimage verification.
-- The app then treats the payment as successful and calls `showPaymentSuccess(tokenFromLightningMint, amount)` or similar once minting completes.
-
----
-
-## 4. Integration Points in Existing Code
-
-### 4.1. In `NdefHostCardEmulationService` / `CashuPaymentHelper`
-
-**Today:**
-
-```java
-isValid = CashuPaymentHelper.validateToken(cashuToken, expectedAmount, allowedMints);
-
-if (!isValid) {
-    String errorMsg = ...;
-    paymentCallback.onCashuPaymentError(errorMsg);
-    clearPaymentRequest();
-    return;
-}
-
-String redeemedToken = CashuPaymentHelper.redeemToken(cashuToken);
-paymentCallback.onCashuTokenReceived(redeemedToken);
-```
-
-**Planned:**
-
-1. Replace `boolean` validation with structured `TokenValidationResult`.
-2. Branch:
-
-   ```kotlin
-   when (val result = CashuPaymentHelper.validateTokenDetailed(cashuToken, expectedAmount, allowedMints)) {
-       is ValidKnownMint -> {
-           val redeemedToken = CashuPaymentHelper.redeemToken(cashuToken)
-           callback.onCashuTokenReceived(redeemedToken)
-       }
-       is ValidUnknownMint -> {
-           // Start swap flow
-           SwapToLightningMintManager.swapFromUnknownMint(
-               cashuToken = cashuToken,
-               expectedAmount = expectedAmount,
-               unknownMintUrl = result.mintUrl,
-               // Provide current paymentId / context so we can reuse Lightning quote
-               paymentContext = currentPaymentContext
-           ) { swapResult ->
-               when (swapResult) {
-                   is SwapResult.Success -> callback.onCashuTokenReceived(swapResult.finalToken)
-                   is SwapResult.Failure -> callback.onCashuPaymentError(swapResult.errorMessage)
-               }
-           }
-       }
-       is InvalidFormat, is InsufficientAmount -> {
-           callback.onCashuPaymentError("Invalid or insufficient token")
-       }
-   }
-   ```
-
-### 4.2. `SwapToLightningMintManager` (new component)
-
-**Location suggestion:**
-
-- `app/src/main/java/com/electricdreams/numo/payment/SwapToLightningMintManager.kt`
-
-**Responsibilities:**
-
-- Orchestrate the **6 phases** for a single payment.
-- Be **suspend‑friendly** (use coroutines) and UI‑agnostic.
-- Expose a high‑level API:
-
-  ```kotlin
-  sealed class SwapResult {
-      data class Success(
-          val finalToken: String,        // token from Lightning mint credited to merchant
-          val lightningMintUrl: String,
-          val amountSats: Long
-      ) : SwapResult()
-      data class Failure(val errorMessage: String) : SwapResult()
-  }
-
-  object SwapToLightningMintManager {
-      suspend fun swapFromUnknownMint(
-          cashuToken: String,
-          expectedAmount: Long,
-          unknownMintUrl: String,
-          paymentContext: PaymentContext
-      ): SwapResult
-  }
-  ```
-
-**Internal steps:**
-
-1. Parse token,.confirm amount.
-2. Check mint reachability (`CashuWalletManager.fetchMintInfo`).
-3. Get or create Lightning mint invoice via `LightningMintInvoiceManager`.
-4. Request melt quote from unknown mint.
-5. Enforce fee reserve ≤ 5%.
-6. Execute melt + `checkMeltQuote`.
-7. Extract preimage and verify against invoice payment hash.
-8. Ensure Lightning mint has minted proofs (reuse `LightningMintHandler` where feasible).
-9. Return `Success(finalTokenFromLightningMint, lightningMintUrl, expectedAmount)`.
-
-### 4.3. Persistence / history
-
-- Extend `PaymentHistoryEntry` if needed to record:
-  - `sourceMintUrl` (unknown mint).
-  - `lightningMintUrl`.
-  - `swapType = "swap_to_lightning_mint"`.
-  - `meltQuoteIdFromUnknownMint`.
-  - `lightningMintQuoteId`.
-
-This will be useful for debugging and reconciliation.
-
----
-
-## 5. Edge Cases & Failure Handling
-
-- **Unknown mint unreachable:**
-  - `fetchMintInfo` returns `null` → show error: "Payer’s mint is unreachable. Please try another mint or payment method.".
-
-- **Insufficient amount / high fees:**
-  - If `meltQuote.amount < expectedAmount` or `feeReserve > 5%`, abort swap with clear message.
-
-- **Melt fails or stays pending:**
-  - If `checkMeltQuote` reports `UNPAID` or `PENDING` for too long, surface error / timeout.
-
-- **Preimage mismatch:**
-  - Security‑critical: if SHA256(preimage) ≠ payment hash, **treat as failure** and do not mark payment as received.
-
-- **Lightning mint never mints:**
-  - Even if unknown mint reports `PAID`, but our Lightning mint quote is never marked `PAID`, we should eventually treat this as a failed swap and inform the operator.
-
----
-
-## 6. Summary of Required CDK APIs (from `cdk_ffi.kt` / existing usage)
-
-Already used in app and expected to be reused for SwapToLightningMint:
-
-- `MultiMintWallet.fetchMintInfo(MintUrl) : MintInfo?`
-- `MultiMintWallet.mintQuote(MintUrl, Amount, memo) : MintQuote`
-- `MultiMintWallet.meltQuote(MintUrl, bolt11: String, ?) : MeltQuote`
-- `MultiMintWallet.meltWithMint(MintUrl, quoteId: String) : Melted`
-- `MultiMintWallet.checkMeltQuote(MintUrl, quoteId: String) : MeltQuote` (with `QuoteState`)
-
-Additionally required (or to be added/verified):
-
-- Accessor for **payment preimage** from melt result or quote.
-- (Optional) helper to parse **payment hash from BOLT11** or external library.
-
----
-
-## 7. Implementation Plan (Step‑By‑Step)
-
-1. **Refactor token validation** (`CashuPaymentHelper.validateToken`) to return structured `TokenValidationResult`.
-2. **Add SwapToLightningMintManager** with suspend API and unit tests (pure logic where possible).
-3. **Add LightningMintInvoiceManager** to generate/reuse Lightning mint invoices per payment.
-4. **Wire into NDEF/HCE flow** in `NdefHostCardEmulationService` to:
-   - Defer errors on unknown mints until after attempting swap.
-5. **Add preimage / invoice hash utilities**:
-   - Implement SHA‑256 check.
-   - Implement BOLT11 payment hash extraction.
-6. **Extend payment history models** to record swap metadata.
-7. **Add robust logging** for all phases 1–6 to aid debugging.
-8. **QA flows**:
-   - Known mint → existing behavior unchanged.
-   - Unknown but reachable mint → swap path taken, melt + Lightning mint succeed.
-   - Unknown unreachable mint → clear error, no partial success.
-   - High‑fee quote or preimage mismatch → fail safely.
-
-This concludes the initial design plan for **SwapToLightningMint**.
-
-
----
-
-## 8. Refinement: Where and How to Fetch the Payment Preimage from CDK
-
-This section refines the plan specifically around **how to obtain the payment preimage from the CDK types** and how to validate it against the BOLT11 invoice’s payment hash.
-
-### 8.1. Relevant CDK Types
-
-From `cdk-kotlin/lib/src/main/kotlin/org/cashudevkit/cdk_ffi.kt` we have two relevant data structures:
-
-#### 8.1.1. `MeltQuote`
-
-```kotlin
-/**
- * FFI-compatible MeltQuote
- */
-data class MeltQuote (
-    /** Quote ID */
-    var id: String,
-    /** Quote amount */
-    var amount: Amount,
-    /** Currency unit */
-    var unit: CurrencyUnit,
-    /** Payment request */
-    var request: String,
-    /** Fee reserve */
-    var feeReserve: Amount,
-    /** Quote state */
-    var state: QuoteState,
-    /** Expiry timestamp */
-    var expiry: ULong,
-    /** Payment preimage */
-    var paymentPreimage: String?,
-    /** Payment method */
-    var paymentMethod: PaymentMethod,
-)
-```
-
-Key field for us:
-
-- `paymentPreimage: String?`
-  - This is present on the **MeltQuote** itself and is filled when the quote is in the appropriate state (after payment).
-  - It is surfaced via both `wallet.meltQuote(...)` / `wallet.checkMeltQuote(...)` and the higher‑level database APIs (`getMeltQuote`).
-
-#### 8.1.2. `MeltQuoteBolt11Response`
-
-```kotlin
-/**
- * FFI-compatible MeltQuoteBolt11Response
- */
-public interface MeltQuoteBolt11ResponseInterface {
-    fun amount(): Amount
-    fun expiry(): ULong
-    fun feeReserve(): Amount
-    fun paymentPreimage(): String?
-    fun quote(): String
-    fun request(): String?
-    fun state(): QuoteState
-    fun unit(): CurrencyUnit?
-}
-```
-
-- Used in `NotificationPayload.MeltQuoteUpdate` to push quote updates (e.g. over WebSockets).
-- Also exposes `paymentPreimage(): String?`.
-
-**Conclusion:** We can safely rely on **`MeltQuote.paymentPreimage`** and/or **`MeltQuoteBolt11Response.paymentPreimage()`** as the source of the preimage returned from the mint after a successful melt.
-
-### 8.2. When Exactly is `paymentPreimage` Available?
-
-By design of the protocol and the bindings:
-
-- When we first request a quote via `wallet.meltQuote(...)`, `paymentPreimage` **will usually be `null`** — the Lightning payment has not yet been executed.
-- After we execute the melt via `wallet.meltWithMint(MintUrl, quoteId)`, and then call
-  - either `wallet.checkMeltQuote(MintUrl, quoteId)`
-  - or receive a `NotificationPayload.MeltQuoteUpdate` (which wraps `MeltQuoteBolt11Response`),
-  the quote will carry the **final state** (e.g. `QuoteState.PAID`) and a **non‑null `paymentPreimage`** if the Lightning payment was executed.
-
-So the refined rule is:
-
-- **We must always obtain the preimage from the _final_ melt quote** (`checkMeltQuote` or notification), **after** a successful `meltWithMint`.
-
-### 8.3. Data Flow for the Unknown‑Mint Melt Preimage
-
-For the SwapToLightningMint flow, we are concerned with the **unknown payer mint**. The data flow there will be:
-
-1. Request a melt quote:
-
-   ```kotlin
-   val initialQuote = wallet.meltQuote(MintUrl(unknownMintUrl), bolt11Invoice, null)
-   // initialQuote.paymentPreimage is expected to be null here
-   ```
-
-2. Execute the melt:
-
-   ```kotlin
-   val melted = wallet.meltWithMint(MintUrl(unknownMintUrl), initialQuote.id)
-   // We don't rely on `melted` for preimage; we use the final quote.
-   ```
-
-3. Fetch the **final quote** and read `paymentPreimage`:
-
-   ```kotlin
-   val finalQuote = wallet.checkMeltQuote(MintUrl(unknownMintUrl), initialQuote.id)
-
-   if (finalQuote.state != QuoteState.PAID) {
-       throw Exception("Unknown-mint melt did not complete successfully: state=${finalQuote.state}")
-   }
-
-   val preimageHex = finalQuote.paymentPreimage
-       ?: throw Exception("No payment preimage present on final melt quote")
-   ```
-
-4. Convert the hex-encoded preimage to bytes:
-
-   ```kotlin
-   fun hexToBytes(hex: String): ByteArray {
-       val len = hex.length
-       require(len % 2 == 0) { "Hex string must have even length" }
-       return ByteArray(len / 2) { i ->
-           val idx = i * 2
-           hex.substring(idx, idx + 2).toInt(16).toByte()
-       }
-   }
-
-   val preimageBytes = hexToBytes(preimageHex)
-   ```
-
-**Note:** We assume `paymentPreimage` is hex‑encoded (this is consistent with the rest of the CDK bindings that expose secrets and hashes as hex strings). If the underlying CDK changes to base64 or raw bytes, we would adjust the decoder accordingly, but the plan is to treat it as hex for now.
-
-### 8.4. Alternative Path: Using `MeltQuoteBolt11Response` Notifications
-
-If/when we start using WebSocket subscriptions to track the unknown‑mint melt as well, the notification payload type:
-
-```kotlin
-sealed class NotificationPayload {
-    data class MeltQuoteUpdate(val quote: MeltQuoteBolt11Response) : NotificationPayload()
-    // ...
-}
-```
-
-will be emitted with a `quote` that exposes:
-
-```kotlin
-val preimageHex = quote.paymentPreimage()
-```
-
-We can unify handling by **always normalizing notifications into a `MeltQuote`** (or reading the same fields) and then reusing the same hex‑decode and verification logic described above.
-
-For the first iteration, however, **we can rely solely on `wallet.checkMeltQuote`** and not subscribe to notifications for the unknown mint.
-
-### 8.5. Extracting the Payment Hash from BOLT11
-
-To compare the preimage provided by the unknown mint to the hash in the Lightning mint’s invoice, we need the **payment hash** embedded in the BOLT11 invoice.
-
-We do not yet have a helper for this in the app; options:
-
-1. **Use a small BOLT11 parsing library** (preferred for correctness and maintenance).
-2. **Implement a minimal internal parser** that:
-   - Decodes HRP / data part.
-   - Walks TLV records until it finds the `p` tag (payment hash).
-
-For planning purposes, we define an interface:
-
-```kotlin
-/**
- * Extract the 32-byte payment hash from a BOLT11 invoice.
- * @throws IllegalArgumentException if the invoice is invalid or contains no payment hash.
- */
-fun extractPaymentHashFromBolt11(bolt11: String): ByteArray
-```
-
-Implementation details (library vs. manual) can be decided during coding, but the **call site** for the swap flow is clear.
-
-### 8.6. Preimage vs. Payment Hash Verification Logic
-
-Putting the pieces together, the core verification routine used by SwapToLightningMint becomes:
-
-```kotlin
-/**
- * Verify that the preimage reported by the unknown mint for a given melt quote
- * matches the payment hash encoded in the BOLT11 invoice.
- */
-fun verifyMeltPreimageMatchesInvoice(
-    preimageHex: String,
-    bolt11Invoice: String
-) {
-    val preimageBytes = hexToBytes(preimageHex)
-
-    // Compute SHA-256(preimage)
-    val digest = java.security.MessageDigest.getInstance("SHA-256")
-    val computedHash = digest.digest(preimageBytes)
-
-    // Extract payment hash (32 bytes) from the invoice
-    val invoiceHash = extractPaymentHashFromBolt11(bolt11Invoice)
-
-    if (!computedHash.contentEquals(invoiceHash)) {
-        throw IllegalStateException("Payment preimage does not match invoice payment hash")
-    }
-}
-```
-
-**Security property:** If this check passes:
-
-- The unknown mint’s claimed preimage is **exactly** the secret whose SHA‑256 hash the Lightning mint encoded into the invoice’s payment hash.
-- This binds the unknown mint’s reported payment to **the exact invoice** we generated from our Lightning mint.
-
-### 8.7. Updated SwapToLightningMint Flow (Concrete Steps, Implemented)
-
-Putting the pieces together, the implemented flow is:
-
-1. **Temporary Wallet melt quote (unknown mint)**
-
-   ```kotlin
-   val tempWallet = CashuWalletManager.getTemporaryWalletForMint(unknownMintUrl)
-   val meltQuote = tempWallet.meltQuote(bolt11Invoice, null)
-   // Enforce feeReserve / amount <= 5%
-   ```
-
-2. **Lightning mint quote via MultiMintWallet**
-
-   ```kotlin
-   val lightningInvoiceInfo = LightningMintInvoiceManager.getOrCreateInvoiceForPayment(
-       appContext,
-       lightningMintUrl,
-       paymentContext
-   )
-   val bolt11 = lightningInvoiceInfo.bolt11
-   ```
-
-3. **Persist SwapToLightningMint frame** on `PaymentHistoryEntry`.
-
-4. **Execute melt on temp Wallet**
-
-   ```kotlin
-   tempWallet.melt(meltQuote.id)
-   ```
-
-5. **Check final melt quote & verify preimage** via `MultiMintWallet`:
-
-   ```kotlin
-   val finalQuote = mainWallet.checkMeltQuote(MintUrl(unknownMintUrl), meltQuote.id)
-   val preimageHex = finalQuote.paymentPreimage ?: error("no paymentPreimage")
-   verifyMeltPreimageMatchesInvoice(preimageHex, bolt11Invoice)
-   ```
-
-Only after all of the above succeed do we treat the unknown‑mint melt as
-valid and continue with the rest of the SwapToLightningMint flow.
-
-### 8.8. Summary of Preimage Handling Contract
-
-- **Source of truth**: `MeltQuote.paymentPreimage` on the unknown mint’s final quote (via `wallet.checkMeltQuote`).
-- **Encoding**: treated as hex string → `ByteArray` via `hexToBytes`.
-- **Verification**: SHA‑256(preimage) must equal the BOLT11 invoice’s payment hash from `extractPaymentHashFromBolt11`.
-- **Failure behavior**:
-  - If `paymentPreimage` is null, or quote is not `PAID`, or hashes differ → **swap fails**; payment is not accepted.
-
-This refinement can now be used as the implementation blueprint for the preimage verification part of the SwapToLightningMint flow.
-
diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
new file mode 100644
index 00000000..dceeba68
--- /dev/null
+++ b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,13 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e99bae143b75f9a10ead10248f02055e/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/658299a896470fbb3103ba3a430ee227/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/56a19bc915b9ba2eb62ba7554c61b919/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/248ffb1098f61659502d0c09aa348294/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/dbd05c4936d573642f94cd149e1356c8/redirect
+toolchainVendor=JETBRAINS
+toolchainVersion=21
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e116db01..40dd22c2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,6 +5,9 @@ pluginManagement {
         mavenCentral()
     }
 }
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+}
 
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)