diff --git a/miner-app/lib/features/miner/miner_controls.dart b/miner-app/lib/features/miner/miner_controls.dart
index 70b9c5f56..9c32370df 100644
--- a/miner-app/lib/features/miner/miner_controls.dart
+++ b/miner-app/lib/features/miner/miner_controls.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:quantus_miner/src/config/miner_config.dart';
 import 'package:quantus_miner/src/services/miner_wallet_service.dart';
 import 'package:quantus_miner/src/services/mining_orchestrator.dart';
 import 'package:quantus_miner/src/services/mining_stats_service.dart';
@@ -38,7 +37,6 @@ class _MinerControlsState extends State<MinerControls> {
   int _cpuWorkers = 8;
   int _gpuDevices = 0;
   int _detectedGpuCount = 0;
-  String _chainId = MinerConfig.defaultChainId;
   final _settingsService = MinerSettingsService();
 
   @override
@@ -51,13 +49,11 @@ class _MinerControlsState extends State<MinerControls> {
   Future<void> _loadSettings() async {
     final savedCpuWorkers = await _settingsService.getCpuWorkers();
     final savedGpuDevices = await _settingsService.getGpuDevices();
-    final savedChainId = await _settingsService.getChainId();
 
     if (mounted) {
       setState(() {
         _cpuWorkers = savedCpuWorkers ?? (Platform.numberOfProcessors > 0 ? Platform.numberOfProcessors : 8);
         _gpuDevices = savedGpuDevices ?? 0;
-        _chainId = savedChainId;
       });
     }
   }
@@ -93,13 +89,6 @@ class _MinerControlsState extends State<MinerControls> {
   Future<void> _startNode() async {
     _log.i('Starting node');
 
-    // Reload chain ID in case it was changed in settings
-    final chainId = await _settingsService.getChainId();
-    if (mounted) {
-      setState(() => _chainId = chainId);
-    }
-
-    // Get rewards preimage directly from the wallet (not from file)
     final walletService = MinerWalletService();
     final wormholeKeyPair = await walletService.getWormholeKeyPair();
     if (wormholeKeyPair == null) {
@@ -110,7 +99,6 @@ class _MinerControlsState extends State<MinerControls> {
       return;
     }
 
-    // Check for required files
     final quantusHome = await BinaryManager.getQuantusHomeDirectoryPath();
     final identityFile = File('$quantusHome/node_key.p2p');
     final nodeBinPath = await BinaryManager.getNodeBinaryFilePath();
@@ -126,7 +114,6 @@ class _MinerControlsState extends State<MinerControls> {
       return;
     }
 
-    // Create new orchestrator
     final orchestrator = MiningOrchestrator();
     widget.onOrchestratorChanged(orchestrator);
 
@@ -138,7 +125,6 @@ class _MinerControlsState extends State<MinerControls> {
           identityFile: identityFile,
           rewardsInnerHash: wormholeKeyPair.rewardsPreimageHex,
           wormholeAddress: wormholeKeyPair.address,
-          chainId: _chainId,
           cpuWorkers: _cpuWorkers,
           gpuDevices: _gpuDevices,
           detectedGpuCount: _detectedGpuCount,
diff --git a/miner-app/lib/features/settings/settings_screen.dart b/miner-app/lib/features/settings/settings_screen.dart
index d484c34f2..c8d534d86 100644
--- a/miner-app/lib/features/settings/settings_screen.dart
+++ b/miner-app/lib/features/settings/settings_screen.dart
@@ -1,10 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:quantus_miner/features/settings/settings_app_bar.dart';
-import 'package:quantus_miner/main.dart';
-import 'package:quantus_miner/src/config/miner_config.dart';
 import 'package:quantus_miner/src/services/binary_manager.dart';
-import 'package:quantus_miner/src/services/miner_settings_service.dart';
 import 'package:quantus_miner/src/services/miner_wallet_service.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 
@@ -20,10 +17,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
   BinaryVersion? _nodeUpdateInfo;
   bool _isLoading = true;
 
-  // Chain selection
-  final MinerSettingsService _settingsService = MinerSettingsService();
   final MinerWalletService _walletService = MinerWalletService();
-  String _selectedChainId = MinerConfig.defaultChainId;
 
   @override
   void initState() {
@@ -39,77 +33,15 @@ class _SettingsScreenState extends State<SettingsScreen> {
       BinaryManager.getMinerBinaryVersion(),
     ]);
 
-    final chainId = await _settingsService.getChainId();
-
     if (mounted) {
       setState(() {
         _minerUpdateInfo = minerUpdateInfo;
         _nodeUpdateInfo = nodeUpdateInfo;
-        _selectedChainId = chainId;
         _isLoading = false;
       });
     }
   }
 
-  Future<void> _onChainChanged(String? newChainId) async {
-    if (newChainId == null || newChainId == _selectedChainId) return;
-
-    // Check if mining is currently running
-    final orchestrator = GlobalMinerManager.getOrchestrator();
-    final isMining = orchestrator?.isRunning ?? false;
-
-    if (isMining) {
-      // Show warning dialog
-      final shouldChange = await showDialog<bool>(
-        context: context,
-        builder: (context) => AlertDialog(
-          backgroundColor: const Color(0xFF1C1C1C),
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-          title: const Text('Stop Mining?', style: TextStyle(color: Colors.white)),
-          content: const Text(
-            'Changing the chain requires stopping mining first. '
-            'Do you want to stop mining and switch chains?',
-            style: TextStyle(color: Colors.white70),
-          ),
-          actions: [
-            TextButton(
-              onPressed: () => Navigator.of(context).pop(false),
-              child: Text('Cancel', style: TextStyle(color: Colors.white.useOpacity(0.7))),
-            ),
-            TextButton(
-              onPressed: () => Navigator.of(context).pop(true),
-              style: TextButton.styleFrom(foregroundColor: const Color(0xFF00E676)),
-              child: const Text('Stop & Switch'),
-            ),
-          ],
-        ),
-      );
-
-      if (shouldChange != true) return;
-
-      // Stop mining
-      await orchestrator?.stop();
-    }
-
-    // Save the new chain ID
-    await _settingsService.saveChainId(newChainId);
-
-    if (mounted) {
-      setState(() {
-        _selectedChainId = newChainId;
-      });
-
-      // Show confirmation
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text('Switched to ${MinerConfig.getChainById(newChainId).displayName}'),
-          backgroundColor: const Color(0xFF00E676),
-          behavior: SnackBarBehavior.floating,
-        ),
-      );
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     // Define a theme-consistent accent color (e.g., a tech green or teal)
@@ -177,23 +109,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
 
                         const SizedBox(height: 32),
 
-                        // Network Section Header
-                        Text(
-                          'NETWORK',
-                          style: TextStyle(
-                            color: Colors.white.useOpacity(0.5),
-                            fontSize: 12,
-                            letterSpacing: 1.5,
-                            fontWeight: FontWeight.w600,
-                          ),
-                        ),
-                        const SizedBox(height: 16),
-
-                        // Chain Selector
-                        _buildChainSelector(accentColor),
-
-                        const SizedBox(height: 32),
-
                         // Wallet Section Header
                         Text(
                           'WALLET',
@@ -291,79 +206,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  Widget _buildChainSelector(Color accentColor) {
-    final selectedChain = MinerConfig.getChainById(_selectedChainId);
-
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(
-        color: const Color(0xFF1C1C1C),
-        borderRadius: BorderRadius.circular(16),
-        border: Border.all(color: Colors.white.useOpacity(0.05), width: 1),
-        boxShadow: [BoxShadow(color: Colors.black.useOpacity(0.2), blurRadius: 10, offset: const Offset(0, 4))],
-      ),
-      child: Row(
-        children: [
-          // Icon Container
-          Container(
-            padding: const EdgeInsets.all(10),
-            decoration: BoxDecoration(color: accentColor.useOpacity(0.1), borderRadius: BorderRadius.circular(12)),
-            child: Icon(Icons.link_rounded, color: accentColor, size: 20),
-          ),
-          const SizedBox(width: 16),
-
-          // Title and description
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const Text(
-                  'Chain',
-                  style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w500),
-                ),
-                const SizedBox(height: 2),
-                Text(selectedChain.description, style: TextStyle(color: Colors.white.useOpacity(0.5), fontSize: 12)),
-              ],
-            ),
-          ),
-
-          // Dropdown
-          if (_isLoading)
-            SizedBox(
-              width: 16,
-              height: 16,
-              child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white.useOpacity(0.3)),
-            )
-          else
-            Container(
-              padding: const EdgeInsets.symmetric(horizontal: 8),
-              decoration: BoxDecoration(
-                color: Colors.black,
-                borderRadius: BorderRadius.circular(8),
-                border: Border.all(color: Colors.white.useOpacity(0.1)),
-              ),
-              child: DropdownButton<String>(
-                value: _selectedChainId,
-                dropdownColor: const Color(0xFF1C1C1C),
-                underline: const SizedBox(),
-                icon: Icon(Icons.arrow_drop_down, color: Colors.white.useOpacity(0.7)),
-                style: TextStyle(
-                  color: Colors.white.useOpacity(0.9),
-                  fontFamily: 'Courier',
-                  fontWeight: FontWeight.bold,
-                  fontSize: 13,
-                ),
-                items: MinerConfig.availableChains.map((chain) {
-                  return DropdownMenuItem<String>(value: chain.id, child: Text(chain.displayName));
-                }).toList(),
-                onChanged: _onChainChanged,
-              ),
-            ),
-        ],
-      ),
-    );
-  }
-
   Widget _buildActionTile({
     required String title,
     required String subtitle,
diff --git a/miner-app/lib/features/withdrawal/claim_rewards_dialog.dart b/miner-app/lib/features/withdrawal/claim_rewards_dialog.dart
index 05eab0b8a..3b9807d14 100644
--- a/miner-app/lib/features/withdrawal/claim_rewards_dialog.dart
+++ b/miner-app/lib/features/withdrawal/claim_rewards_dialog.dart
@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:quantus_miner/src/services/binary_manager.dart';
-import 'package:quantus_miner/src/services/miner_settings_service.dart';
 import 'package:quantus_miner/src/services/miner_wallet_service.dart';
 import 'package:quantus_miner/src/services/wormhole_claim_service.dart';
 import 'package:quantus_miner/src/utils/app_logger.dart';
@@ -32,7 +31,6 @@ class _ClaimRewardsDialogState extends State<_ClaimRewardsDialog> {
   final _addressController = TextEditingController();
   final _claimService = WormholeClaimService();
   final _walletService = MinerWalletService();
-  final _settingsService = MinerSettingsService();
 
   _Screen _screen = _Screen.input;
   String? _addressError;
@@ -101,18 +99,15 @@ class _ClaimRewardsDialogState extends State<_ClaimRewardsDialog> {
         throw StateError('Wormhole key pair not available');
       }
 
-      final chainConfig = await _settingsService.getChainConfig();
       final binsDir = '${await BinaryManager.getQuantusHomeDirectoryPath()}/generated-bins';
       await Directory(binsDir).create(recursive: true);
 
-      final rpcUrl = chainConfig.rpcUrl;
       _log.i('Starting claim for ${keyPair.address} to ${_addressController.text.trim()}');
 
       final result = await _claimService.claimRewards(
         wormholeAddress: keyPair.address,
         secretHex: keyPair.secretHex,
         destinationAddress: _addressController.text.trim(),
-        rpcUrl: rpcUrl,
         circuitBinsDir: binsDir,
         onProgress: (progress) {
           if (!mounted) return;
diff --git a/miner-app/lib/src/config/miner_config.dart b/miner-app/lib/src/config/miner_config.dart
index bf76e1854..e3ce8f5b1 100644
--- a/miner-app/lib/src/config/miner_config.dart
+++ b/miner-app/lib/src/config/miner_config.dart
@@ -101,41 +101,9 @@ class MinerConfig {
   // Chain Configuration
   // ============================================================
 
-  /// Available chain IDs
-  static const List<ChainConfig> availableChains = [
-    ChainConfig(
-      id: 'dev',
-      displayName: 'Development',
-      description: 'Local development chain',
-      rpcUrl: 'http://127.0.0.1:9933',
-      subsquidUrl: 'http://127.0.0.1:4350/graphql',
-      isDefault: false,
-    ),
-    ChainConfig(
-      id: 'dirac',
-      displayName: 'Dirac',
-      description: 'Dirac testnet',
-      rpcUrl: 'https://a1-dirac.quantus.cat',
-      subsquidUrl: 'https://subsquid.quantus.com/blue/graphql',
-      isDefault: false,
-    ),
-    ChainConfig(
-      id: 'planck',
-      displayName: 'Planck Testnet',
-      description: 'Planck testnet',
-      rpcUrl: 'https://a1-planck.quantus.cat',
-      subsquidUrl: 'http://127.0.0.1:4000/graphql', // Local Subsquid for testing
-      isDefault: true,
-    ),
-  ];
-
-  /// Get chain config by ID, returns dev chain if not found
-  static ChainConfig getChainById(String id) {
-    return availableChains.firstWhere((chain) => chain.id == id, orElse: () => availableChains.first);
-  }
-
-  /// The default chain ID
-  static String get defaultChainId => availableChains.firstWhere((c) => c.isDefault).id;
+  /// Chain spec passed to the local node binary via `--chain`.
+  /// Wallet/UTXO/claim endpoints come from `AppConstants` in the SDK.
+  static const String chainId = 'planck';
 
   // ============================================================
   // Process Names (for cleanup)
@@ -170,30 +138,3 @@ class MinerConfig {
   /// Number of ports to try when finding an alternative
   static const int portSearchRange = 10;
 }
-
-/// Configuration for a blockchain network.
-///
-/// Named ChainConfig to avoid conflict with ChainInfo in chain_rpc_client.dart
-class ChainConfig {
-  final String id;
-  final String displayName;
-  final String description;
-  final String rpcUrl;
-  final String? subsquidUrl;
-  final bool isDefault;
-
-  const ChainConfig({
-    required this.id,
-    required this.displayName,
-    required this.description,
-    required this.rpcUrl,
-    this.subsquidUrl,
-    this.isDefault = false,
-  });
-
-  /// Whether this chain uses the local node RPC
-  bool get isLocalNode => rpcUrl.contains('127.0.0.1') || rpcUrl.contains('localhost');
-
-  @override
-  String toString() => 'ChainConfig(id: $id, displayName: $displayName, rpcUrl: $rpcUrl)';
-}
diff --git a/miner-app/lib/src/services/miner_settings_service.dart b/miner-app/lib/src/services/miner_settings_service.dart
index be6f26295..3a4f14bc3 100644
--- a/miner-app/lib/src/services/miner_settings_service.dart
+++ b/miner-app/lib/src/services/miner_settings_service.dart
@@ -1,10 +1,8 @@
 import 'dart:io';
 
-import 'package:quantus_miner/src/config/miner_config.dart';
 import 'package:quantus_miner/src/services/binary_manager.dart';
 import 'package:quantus_miner/src/services/miner_wallet_service.dart';
 import 'package:quantus_miner/src/utils/app_logger.dart';
-import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 final _log = log.withTag('Settings');
@@ -13,14 +11,12 @@ final _log = log.withTag('Settings');
 ///
 /// This is a singleton - use `MinerSettingsService()` to get the instance.
 class MinerSettingsService {
-  // Singleton
   static final MinerSettingsService _instance = MinerSettingsService._internal();
   factory MinerSettingsService() => _instance;
   MinerSettingsService._internal();
 
   static const String _keyCpuWorkers = 'cpu_workers';
   static const String _keyGpuDevices = 'gpu_devices';
-  static const String _keyChainId = 'chain_id';
 
   Future<void> saveCpuWorkers(int cpuWorkers) async {
     final prefs = await SharedPreferences.getInstance();
@@ -42,64 +38,6 @@ class MinerSettingsService {
     return prefs.getInt(_keyGpuDevices);
   }
 
-  /// Save the selected chain ID and configure endpoints accordingly.
-  Future<void> saveChainId(String chainId) async {
-    final prefs = await SharedPreferences.getInstance();
-    await prefs.setString(_keyChainId, chainId);
-    // Update GraphQL endpoint for the selected chain
-    _configureEndpointsForChain(chainId);
-  }
-
-  /// Configure RPC and GraphQL endpoints based on chain ID.
-  void _configureEndpointsForChain(String chainId) {
-    final chain = MinerConfig.getChainById(chainId);
-    _log.i('Configuring endpoints for chain $chainId:');
-    _log.i('  RPC: ${chain.rpcUrl}');
-    _log.i('  GraphQL: ${chain.subsquidUrl ?? 'not configured'}');
-
-    // Configure RPC endpoint for SubstrateService
-    final rpcService = RpcEndpointService();
-    _log.i('  RPC endpoints before: ${rpcService.endpoints.length}');
-    // rpcService.setEndpoints([chain.rpcUrl]);
-    // _log.i('  RPC endpoints after: ${rpcService.endpoints.length}');
-    // _log.i('  Best RPC endpoint: ${rpcService.bestEndpointUrl}');
-
-    // Configure GraphQL endpoint (for any remaining Subsquid usage)
-    // if (chain.subsquidUrl != null) {
-    //   GraphQlEndpointService().setEndpoints([chain.subsquidUrl!]);
-    // } else {
-    //   GraphQlEndpointService().setEndpoints([]);
-    // }
-  }
-
-  /// Get the saved chain ID, returns default if not set.
-  /// Also configures GraphQL endpoints for the chain.
-  Future<String> getChainId() async {
-    final prefs = await SharedPreferences.getInstance();
-    final savedChainId = prefs.getString(_keyChainId);
-    String chainId;
-    if (savedChainId == null) {
-      chainId = MinerConfig.defaultChainId;
-    } else {
-      // Validate that the chain ID is still valid
-      final validIds = MinerConfig.availableChains.map((c) => c.id).toList();
-      if (!validIds.contains(savedChainId)) {
-        chainId = MinerConfig.defaultChainId;
-      } else {
-        chainId = savedChainId;
-      }
-    }
-    // Configure endpoints for this chain
-    _configureEndpointsForChain(chainId);
-    return chainId;
-  }
-
-  /// Get the ChainConfig for the saved chain ID.
-  Future<ChainConfig> getChainConfig() async {
-    final chainId = await getChainId();
-    return MinerConfig.getChainById(chainId);
-  }
-
   Future<void> logout() async {
     _log.i('Starting app logout/reset...');
 
diff --git a/miner-app/lib/src/services/mining_orchestrator.dart b/miner-app/lib/src/services/mining_orchestrator.dart
index 8cca8c4f0..214338af6 100644
--- a/miner-app/lib/src/services/mining_orchestrator.dart
+++ b/miner-app/lib/src/services/mining_orchestrator.dart
@@ -64,9 +64,6 @@ class MiningSessionConfig {
   /// Used for transfer tracking.
   final String? wormholeAddress;
 
-  /// Chain ID to connect to.
-  final String chainId;
-
   /// Number of CPU worker threads.
   final int cpuWorkers;
 
@@ -85,7 +82,6 @@ class MiningSessionConfig {
     required this.identityFile,
     required this.rewardsInnerHash,
     this.wormholeAddress,
-    this.chainId = 'dev',
     this.cpuWorkers = 8,
     this.gpuDevices = 0,
     this.detectedGpuCount = 0,
@@ -221,11 +217,9 @@ class MiningOrchestrator {
       _statsService.updateGpuCapacity(config.detectedGpuCount);
       _emitStats();
 
-      // Perform pre-start cleanup
       _setState(MiningState.startingNode);
-      await ProcessCleanupService.performPreStartCleanup(config.chainId);
+      await ProcessCleanupService.performPreStartCleanup();
 
-      // Ensure ports are available
       final ports = await ProcessCleanupService.ensurePortsAvailable(
         quicPort: config.minerListenPort,
         metricsPort: MinerConfig.defaultMinerMetricsPort,
@@ -233,13 +227,11 @@ class MiningOrchestrator {
       _actualMetricsPort = ports['metrics']!;
       _updateMetricsClient();
 
-      // Start node with rewards inner hash directly from config
       await _nodeManager.start(
         NodeConfig(
           binary: config.nodeBinary,
           identityFile: config.identityFile,
           rewardsInnerHash: config.rewardsInnerHash,
-          chainId: config.chainId,
           minerListenPort: config.minerListenPort,
         ),
       );
@@ -278,7 +270,6 @@ class MiningOrchestrator {
       minerBinary: _currentConfig!.minerBinary,
       identityFile: _currentConfig!.identityFile,
       rewardsInnerHash: _currentConfig!.rewardsInnerHash,
-      chainId: _currentConfig!.chainId,
       cpuWorkers: cpuWorkers ?? _currentConfig!.cpuWorkers,
       gpuDevices: gpuDevices ?? _currentConfig!.gpuDevices,
       detectedGpuCount: _currentConfig!.detectedGpuCount,
diff --git a/miner-app/lib/src/services/node_process_manager.dart b/miner-app/lib/src/services/node_process_manager.dart
index 98604f009..6b66ba3e9 100644
--- a/miner-app/lib/src/services/node_process_manager.dart
+++ b/miner-app/lib/src/services/node_process_manager.dart
@@ -24,9 +24,6 @@ class NodeConfig {
   /// Must be hex-encoded with 0x prefix.
   final String rewardsInnerHash;
 
-  /// Chain ID to connect to ('dev' or 'dirac').
-  final String chainId;
-
   /// Port for the QUIC miner connection.
   final int minerListenPort;
 
@@ -43,7 +40,6 @@ class NodeConfig {
     required this.binary,
     required this.identityFile,
     required this.rewardsInnerHash,
-    this.chainId = 'dev',
     this.minerListenPort = 9833,
     this.rpcPort = 9933,
     this.prometheusPort = 9616,
@@ -136,19 +132,25 @@ class NodeProcessManager extends BaseProcessManager {
 
   List<String> _buildArgs(NodeConfig config, String basePath) {
     return [
-      // Only use --base-path for non-dev chains (dev uses temp storage for fresh state)
-      if (config.chainId != 'dev') ...['--base-path', basePath],
-      '--node-key-file', config.identityFile.path,
-      '--rewards-inner-hash', config.rewardsInnerHash,
+      '--base-path',
+      basePath,
+      '--node-key-file',
+      config.identityFile.path,
+      '--rewards-inner-hash',
+      config.rewardsInnerHash,
       '--validator',
-      // Chain selection
-      if (config.chainId == 'dev') '--dev' else ...['--chain', config.chainId],
-      '--port', config.p2pPort.toString(),
-      '--prometheus-port', config.prometheusPort.toString(),
+      '--chain',
+      MinerConfig.chainId,
+      '--port',
+      config.p2pPort.toString(),
+      '--prometheus-port',
+      config.prometheusPort.toString(),
       '--experimental-rpc-endpoint',
       'listen-addr=${MinerConfig.localhost}:${config.rpcPort},methods=unsafe,cors=all',
-      '--name', 'QuantusMinerGUI',
-      '--miner-listen-port', config.minerListenPort.toString(),
+      '--name',
+      'QuantusMinerGUI',
+      '--miner-listen-port',
+      config.minerListenPort.toString(),
       '--enable-peer-sharing',
     ];
   }
diff --git a/miner-app/lib/src/services/process_cleanup_service.dart b/miner-app/lib/src/services/process_cleanup_service.dart
index a144e6870..59f8faefc 100644
--- a/miner-app/lib/src/services/process_cleanup_service.dart
+++ b/miner-app/lib/src/services/process_cleanup_service.dart
@@ -307,10 +307,10 @@ class ProcessCleanupService {
   // ============================================================
 
   /// Cleanup database lock files that may prevent node startup.
-  static Future<void> cleanupDatabaseLocks(String chainId) async {
+  static Future<void> cleanupDatabaseLocks() async {
     try {
       final quantusHome = await BinaryManager.getQuantusHomeDirectoryPath();
-      final lockFilePath = '$quantusHome/node_data/chains/$chainId/db/full/LOCK';
+      final lockFilePath = '$quantusHome/node_data/chains/${MinerConfig.chainId}/db/full/LOCK';
       final lockFile = File(lockFilePath);
 
       if (await lockFile.exists()) {
@@ -318,8 +318,7 @@ class ProcessCleanupService {
         _log.d(' Deleted lock file: $lockFilePath');
       }
 
-      // Also check for other potential lock files
-      final dbDir = Directory('$quantusHome/node_data/chains/$chainId/db/full');
+      final dbDir = Directory('$quantusHome/node_data/chains/${MinerConfig.chainId}/db/full');
       if (await dbDir.exists()) {
         await for (final entity in dbDir.list()) {
           if (entity is File && entity.path.contains('LOCK')) {
@@ -338,10 +337,10 @@ class ProcessCleanupService {
   }
 
   /// Check and fix database directory permissions.
-  static Future<void> ensureDatabaseDirectoryAccess(String chainId) async {
+  static Future<void> ensureDatabaseDirectoryAccess() async {
     try {
       final quantusHome = await BinaryManager.getQuantusHomeDirectoryPath();
-      final dbPath = '$quantusHome/node_data/chains/$chainId/db';
+      final dbPath = '$quantusHome/node_data/chains/${MinerConfig.chainId}/db';
       final dbDir = Directory(dbPath);
 
       // Create the directory if it doesn't exist
@@ -380,11 +379,11 @@ class ProcessCleanupService {
   /// - Existing miner processes
   /// - Database locks
   /// - Ensures directory access
-  static Future<void> performPreStartCleanup(String chainId) async {
+  static Future<void> performPreStartCleanup() async {
     await cleanupExistingNodeProcesses();
     await cleanupExistingMinerProcesses();
-    await cleanupDatabaseLocks(chainId);
-    await ensureDatabaseDirectoryAccess(chainId);
+    await cleanupDatabaseLocks();
+    await ensureDatabaseDirectoryAccess();
   }
 
   /// Kill all quantus processes by name.
diff --git a/miner-app/lib/src/services/wormhole_claim_service.dart b/miner-app/lib/src/services/wormhole_claim_service.dart
index 540c8adf9..2f2d79135 100644
--- a/miner-app/lib/src/services/wormhole_claim_service.dart
+++ b/miner-app/lib/src/services/wormhole_claim_service.dart
@@ -79,14 +79,13 @@ class WormholeClaimService {
     required String wormholeAddress,
     required String secretHex,
     required String destinationAddress,
-    required String rpcUrl,
     required String circuitBinsDir,
     required ClaimProgressCallback onProgress,
   }) async {
     final cancelCompleter = Completer<void>();
     _cancelCompleter = cancelCompleter;
 
-    final rpc = ChainRpcClient(rpcUrl: rpcUrl, timeout: const Duration(seconds: 30));
+    final rpc = ChainRpcClient(rpcUrl: AppConstants.rpcEndpoints.first, timeout: const Duration(seconds: 30));
     try {
       final flow = _runClaimFlow(
         rpc: rpc,
diff --git a/miner-app/macos/Runner/Info.plist b/miner-app/macos/Runner/Info.plist
index 4789daa6a..47451231f 100644
--- a/miner-app/macos/Runner/Info.plist
+++ b/miner-app/macos/Runner/Info.plist
@@ -28,5 +28,9 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+  		<string>mailto</string>
+	</array>
 </dict>
 </plist>
diff --git a/miner-app/pubspec.lock b/miner-app/pubspec.lock
index 0f34f005c..f3d218844 100644
--- a/miner-app/pubspec.lock
+++ b/miner-app/pubspec.lock
@@ -499,8 +499,8 @@ packages:
     dependency: transitive
     description:
       path: dart
-      ref: "v2.0.1"
-      resolved-ref: "57ac13fd7f92afe8e89da30b94fc69fd68125f6f"
+      ref: "v2.2.0"
+      resolved-ref: cd1beb73c12e574dc6f6ac9a4cd6896d3603b62b
       url: "https://github.com/Quantus-Network/qp-human-checkphrase.git"
     source: git
     version: "0.1.0"
diff --git a/miner-app/pubspec.yaml b/miner-app/pubspec.yaml
index 0a15d6716..8b022777f 100644
--- a/miner-app/pubspec.yaml
+++ b/miner-app/pubspec.yaml
@@ -1,6 +1,6 @@
 name: quantus_miner
 description: Quantus PoW miner (desktop / mobile)
-version: 0.4.0
+version: 0.4.1
 publish_to: none
 
 environment:
diff --git a/mobile-app/android/app/src/main/AndroidManifest.xml b/mobile-app/android/app/src/main/AndroidManifest.xml
index 84a2a60ab..11654c360 100644
--- a/mobile-app/android/app/src/main/AndroidManifest.xml
+++ b/mobile-app/android/app/src/main/AndroidManifest.xml
@@ -79,6 +79,10 @@
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
+        <intent>
+            <action android:name="android.intent.action.SENDTO" />
+            <data android:scheme="mailto" />
+        </intent>
 
          <!-- Add this for url_launcher to work with HTTPS URLs -->
         <intent>
diff --git a/mobile-app/android/app/src/main/res/drawable-v21/background.png b/mobile-app/android/app/src/main/res/drawable-v21/background.png
index 8fa49a7c4..ae38b570a 100644
Binary files a/mobile-app/android/app/src/main/res/drawable-v21/background.png and b/mobile-app/android/app/src/main/res/drawable-v21/background.png differ
diff --git a/mobile-app/android/app/src/main/res/drawable/background.png b/mobile-app/android/app/src/main/res/drawable/background.png
index 8fa49a7c4..ae38b570a 100644
Binary files a/mobile-app/android/app/src/main/res/drawable/background.png and b/mobile-app/android/app/src/main/res/drawable/background.png differ
diff --git a/mobile-app/android/app/src/main/res/values-night-v31/styles.xml b/mobile-app/android/app/src/main/res/values-night-v31/styles.xml
index bab4e97cb..fe0b1f0c7 100644
--- a/mobile-app/android/app/src/main/res/values-night-v31/styles.xml
+++ b/mobile-app/android/app/src/main/res/values-night-v31/styles.xml
@@ -6,10 +6,10 @@
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-        <item name="android:windowSplashScreenBackground">#141414</item>
+        <item name="android:windowSplashScreenBackground">#0E0E0E</item>
         <item name="android:windowSplashScreenBrandingImage">@drawable/android12branding</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
-        <item name="android:windowSplashScreenIconBackgroundColor">#141414</item>
+        <item name="android:windowSplashScreenIconBackgroundColor">#0E0E0E</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/mobile-app/android/app/src/main/res/values-v31/styles.xml b/mobile-app/android/app/src/main/res/values-v31/styles.xml
index 8b3483f45..94d17f95d 100644
--- a/mobile-app/android/app/src/main/res/values-v31/styles.xml
+++ b/mobile-app/android/app/src/main/res/values-v31/styles.xml
@@ -6,10 +6,10 @@
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-        <item name="android:windowSplashScreenBackground">#141414</item>
+        <item name="android:windowSplashScreenBackground">#0E0E0E</item>
         <item name="android:windowSplashScreenBrandingImage">@drawable/android12branding</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
-        <item name="android:windowSplashScreenIconBackgroundColor">#141414</item>
+        <item name="android:windowSplashScreenIconBackgroundColor">#0E0E0E</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/mobile-app/assets/fonts/Geist-Bold.ttf b/mobile-app/assets/fonts/Geist-Bold.ttf
new file mode 100644
index 000000000..71dc0022e
Binary files /dev/null and b/mobile-app/assets/fonts/Geist-Bold.ttf differ
diff --git a/mobile-app/assets/fonts/Geist-Light.ttf b/mobile-app/assets/fonts/Geist-Light.ttf
new file mode 100644
index 000000000..cd3835d9a
Binary files /dev/null and b/mobile-app/assets/fonts/Geist-Light.ttf differ
diff --git a/mobile-app/assets/fonts/Geist-Medium.ttf b/mobile-app/assets/fonts/Geist-Medium.ttf
new file mode 100644
index 000000000..97712e551
Binary files /dev/null and b/mobile-app/assets/fonts/Geist-Medium.ttf differ
diff --git a/mobile-app/assets/fonts/Geist-Regular.ttf b/mobile-app/assets/fonts/Geist-Regular.ttf
new file mode 100644
index 000000000..88c6d7007
Binary files /dev/null and b/mobile-app/assets/fonts/Geist-Regular.ttf differ
diff --git a/mobile-app/assets/fonts/Geist-SemiBold.ttf b/mobile-app/assets/fonts/Geist-SemiBold.ttf
new file mode 100644
index 000000000..42d34ff8d
Binary files /dev/null and b/mobile-app/assets/fonts/Geist-SemiBold.ttf differ
diff --git a/mobile-app/assets/fonts/GeistMono-Bold.ttf b/mobile-app/assets/fonts/GeistMono-Bold.ttf
new file mode 100644
index 000000000..736ff7c3b
Binary files /dev/null and b/mobile-app/assets/fonts/GeistMono-Bold.ttf differ
diff --git a/mobile-app/assets/fonts/GeistMono-Light.ttf b/mobile-app/assets/fonts/GeistMono-Light.ttf
new file mode 100644
index 000000000..c21479ab7
Binary files /dev/null and b/mobile-app/assets/fonts/GeistMono-Light.ttf differ
diff --git a/mobile-app/assets/fonts/GeistMono-Medium.ttf b/mobile-app/assets/fonts/GeistMono-Medium.ttf
new file mode 100644
index 000000000..48a0efd19
Binary files /dev/null and b/mobile-app/assets/fonts/GeistMono-Medium.ttf differ
diff --git a/mobile-app/assets/fonts/GeistMono-Regular.ttf b/mobile-app/assets/fonts/GeistMono-Regular.ttf
new file mode 100644
index 000000000..1a30262ab
Binary files /dev/null and b/mobile-app/assets/fonts/GeistMono-Regular.ttf differ
diff --git a/mobile-app/assets/fonts/GeistMono-SemiBold.ttf b/mobile-app/assets/fonts/GeistMono-SemiBold.ttf
new file mode 100644
index 000000000..4d20cf794
Binary files /dev/null and b/mobile-app/assets/fonts/GeistMono-SemiBold.ttf differ
diff --git a/mobile-app/assets/fonts/LICENSE.txt b/mobile-app/assets/fonts/LICENSE.txt
new file mode 100644
index 000000000..8d003fec6
--- /dev/null
+++ b/mobile-app/assets/fonts/LICENSE.txt
@@ -0,0 +1,92 @@
+Copyright (c) 2023 Vercel, in collaboration with basement.studio
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/mobile-app/assets/v2/action_receive.svg b/mobile-app/assets/v2/action_receive.svg
index e59c9dc0a..3e9b92651 100644
--- a/mobile-app/assets/v2/action_receive.svg
+++ b/mobile-app/assets/v2/action_receive.svg
@@ -1,4 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M12 4V18" stroke="#F4F6F9" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M6.8 13L12 18.2L17.2 13" stroke="#F4F6F9" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.45406 10.5459C4.24272 10.3346 4.12399 10.0479 4.12399 9.74906C4.12399 9.45018 4.24272 9.16353 4.45406 8.95219C4.66541 8.74084 4.95205 8.62211 5.25094 8.62211C5.54982 8.62211 5.83647 8.74084 6.04781 8.95219L10.875 13.7812V3C10.875 2.70163 10.9935 2.41548 11.2045 2.2045C11.4155 1.99353 11.7016 1.875 12 1.875C12.2984 1.875 12.5845 1.99353 12.7955 2.2045C13.0065 2.41548 13.125 2.70163 13.125 3V13.7812L17.9541 8.95125C18.1654 8.73991 18.4521 8.62117 18.7509 8.62117C19.0498 8.62117 19.3365 8.73991 19.5478 8.95125C19.7592 9.16259 19.8779 9.44924 19.8779 9.74813C19.8779 10.047 19.7592 10.3337 19.5478 10.545L12.7978 17.295C12.6933 17.3999 12.5691 17.4831 12.4324 17.5399C12.2956 17.5967 12.149 17.6259 12.0009 17.6259C11.8529 17.6259 11.7063 17.5967 11.5695 17.5399C11.4328 17.4831 11.3086 17.3999 11.2041 17.295L4.45406 10.5459ZM20.25 19.125H3.75C3.45163 19.125 3.16548 19.2435 2.9545 19.4545C2.74353 19.6655 2.625 19.9516 2.625 20.25C2.625 20.5484 2.74353 20.8345 2.9545 21.0455C3.16548 21.2565 3.45163 21.375 3.75 21.375H20.25C20.5484 21.375 20.8345 21.2565 21.0455 21.0455C21.2565 20.8345 21.375 20.5484 21.375 20.25C21.375 19.9516 21.2565 19.6655 21.0455 19.4545C20.8345 19.2435 20.5484 19.125 20.25 19.125Z" fill="#FF6B35"/>
 </svg>
diff --git a/mobile-app/assets/v2/action_send.svg b/mobile-app/assets/v2/action_send.svg
index b958acd5b..3ccb01fb9 100644
--- a/mobile-app/assets/v2/action_send.svg
+++ b/mobile-app/assets/v2/action_send.svg
@@ -1,4 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M12 20V6" stroke="#F4F6F9" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
-  <path d="M6.8 11L12 5.8L17.2 11" stroke="#F4F6F9" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19.5459 13.4541C19.7573 13.6654 19.876 13.9521 19.876 14.2509C19.876 14.5498 19.7573 14.8365 19.5459 15.0478C19.3346 15.2592 19.0479 15.3779 18.7491 15.3779C18.4502 15.3779 18.1635 15.2592 17.9522 15.0478L13.125 10.2188V21C13.125 21.2984 13.0065 21.5845 12.7955 21.7955C12.5845 22.0065 12.2984 22.125 12 22.125C11.7016 22.125 11.4155 22.0065 11.2045 21.7955C10.9935 21.5845 10.875 21.2984 10.875 21V10.2188L6.04594 15.0459C5.83459 15.2573 5.54795 15.376 5.24906 15.376C4.95018 15.376 4.66353 15.2573 4.45219 15.0459C4.24084 14.8346 4.12211 14.5479 4.12211 14.2491C4.12211 13.9502 4.24084 13.6635 4.45219 13.4522L11.2022 6.70219C11.3067 6.59731 11.4309 6.51409 11.5676 6.45731C11.7044 6.40053 11.851 6.3713 11.9991 6.3713C12.1471 6.3713 12.2937 6.40053 12.4305 6.45731C12.5672 6.51409 12.6914 6.59731 12.7959 6.70219L19.5459 13.4541ZM20.25 2.625H3.75C3.45163 2.625 3.16548 2.74353 2.9545 2.9545C2.74353 3.16548 2.625 3.45163 2.625 3.75C2.625 4.04837 2.74353 4.33452 2.9545 4.5455C3.16548 4.75647 3.45163 4.875 3.75 4.875H20.25C20.5484 4.875 20.8345 4.75647 21.0455 4.5455C21.2565 4.33452 21.375 4.04837 21.375 3.75C21.375 3.45163 21.2565 3.16548 21.0455 2.9545C20.8345 2.74353 20.5484 2.625 20.25 2.625Z" fill="#FF6B35"/>
 </svg>
diff --git a/mobile-app/assets/v2/ascii_background.png b/mobile-app/assets/v2/ascii_background.png
new file mode 100644
index 000000000..bdd9474bf
Binary files /dev/null and b/mobile-app/assets/v2/ascii_background.png differ
diff --git a/mobile-app/assets/v2/glass_104_x_80.png b/mobile-app/assets/v2/glass_104_x_80.png
deleted file mode 100644
index 07cff1942..000000000
Binary files a/mobile-app/assets/v2/glass_104_x_80.png and /dev/null differ
diff --git a/mobile-app/assets/v2/glass_40.png b/mobile-app/assets/v2/glass_40.png
deleted file mode 100644
index ea6136948..000000000
Binary files a/mobile-app/assets/v2/glass_40.png and /dev/null differ
diff --git a/mobile-app/assets/v2/glass_border_bg.png b/mobile-app/assets/v2/glass_border_bg.png
deleted file mode 100644
index d820670c6..000000000
Binary files a/mobile-app/assets/v2/glass_border_bg.png and /dev/null differ
diff --git a/mobile-app/assets/v2/glass_button_wide_340_bg.png b/mobile-app/assets/v2/glass_button_wide_340_bg.png
deleted file mode 100644
index b4002a53c..000000000
Binary files a/mobile-app/assets/v2/glass_button_wide_340_bg.png and /dev/null differ
diff --git a/mobile-app/assets/v2/glass_circle_icon_button_bg.png b/mobile-app/assets/v2/glass_circle_icon_button_bg.png
deleted file mode 100644
index 2cf38beaa..000000000
Binary files a/mobile-app/assets/v2/glass_circle_icon_button_bg.png and /dev/null differ
diff --git a/mobile-app/assets/v2/glass_medium_button_bg.png b/mobile-app/assets/v2/glass_medium_button_bg.png
deleted file mode 100644
index 32ed0c4ab..000000000
Binary files a/mobile-app/assets/v2/glass_medium_button_bg.png and /dev/null differ
diff --git a/mobile-app/assets/v2/glass_medium_clear.png b/mobile-app/assets/v2/glass_medium_clear.png
deleted file mode 100644
index 2d723f992..000000000
Binary files a/mobile-app/assets/v2/glass_medium_clear.png and /dev/null differ
diff --git a/mobile-app/assets/v2/glass_medium_clear_small.png b/mobile-app/assets/v2/glass_medium_clear_small.png
deleted file mode 100644
index 0f5c59ac4..000000000
Binary files a/mobile-app/assets/v2/glass_medium_clear_small.png and /dev/null differ
diff --git a/mobile-app/assets/v2/glass_tiny_button.png b/mobile-app/assets/v2/glass_tiny_button.png
deleted file mode 100644
index f0bbe6603..000000000
Binary files a/mobile-app/assets/v2/glass_tiny_button.png and /dev/null differ
diff --git a/mobile-app/assets/v2/glass_wide_clear.png b/mobile-app/assets/v2/glass_wide_clear.png
deleted file mode 100644
index 7f55690c8..000000000
Binary files a/mobile-app/assets/v2/glass_wide_clear.png and /dev/null differ
diff --git a/mobile-app/assets/v2/receive_button.png b/mobile-app/assets/v2/receive_button.png
deleted file mode 100644
index 97223961a..000000000
Binary files a/mobile-app/assets/v2/receive_button.png and /dev/null differ
diff --git a/mobile-app/assets/v2/send_button.png b/mobile-app/assets/v2/send_button.png
deleted file mode 100644
index a612c22f5..000000000
Binary files a/mobile-app/assets/v2/send_button.png and /dev/null differ
diff --git a/mobile-app/assets/v2/splash_background.jpg b/mobile-app/assets/v2/splash_background.jpg
new file mode 100644
index 000000000..283d36a05
Binary files /dev/null and b/mobile-app/assets/v2/splash_background.jpg differ
diff --git a/mobile-app/assets/v2/swap_button.png b/mobile-app/assets/v2/swap_button.png
deleted file mode 100644
index ff9b7506b..000000000
Binary files a/mobile-app/assets/v2/swap_button.png and /dev/null differ
diff --git a/mobile-app/assets/v2/uppercase_q.png b/mobile-app/assets/v2/uppercase_q.png
new file mode 100644
index 000000000..5236661a7
Binary files /dev/null and b/mobile-app/assets/v2/uppercase_q.png differ
diff --git a/mobile-app/assets/v2/uppercase_q_black_bg.png b/mobile-app/assets/v2/uppercase_q_black_bg.png
new file mode 100644
index 000000000..c6c570a91
Binary files /dev/null and b/mobile-app/assets/v2/uppercase_q_black_bg.png differ
diff --git a/mobile-app/assets/v2/welcome_screen_bg_image.jpg b/mobile-app/assets/v2/welcome_screen_bg_image.jpg
deleted file mode 100644
index ca195812c..000000000
Binary files a/mobile-app/assets/v2/welcome_screen_bg_image.jpg and /dev/null differ
diff --git a/mobile-app/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/mobile-app/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
index 8fa49a7c4..ae38b570a 100644
Binary files a/mobile-app/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png and b/mobile-app/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index 9d9cfab2f..66ffe8772 100644
Binary files a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index c61a53ab1..23cbbbe15 100644
Binary files a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index 07c0d8243..daf1c7689 100644
Binary files a/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/mobile-app/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/mobile-app/ios/Runner/Base.lproj/LaunchScreen.storyboard b/mobile-app/ios/Runner/Base.lproj/LaunchScreen.storyboard
index 2ee8c838a..9bc86f012 100644
--- a/mobile-app/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/mobile-app/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -38,7 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="622" height="120"/>
+        <image name="LaunchImage" width="160" height="160"/>
         <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>
diff --git a/mobile-app/lib/features/components/migration_dialog.dart b/mobile-app/lib/features/components/migration_dialog.dart
index 03d0bd034..ccfe113b8 100644
--- a/mobile-app/lib/features/components/migration_dialog.dart
+++ b/mobile-app/lib/features/components/migration_dialog.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
 
@@ -76,7 +76,7 @@ class _MigrationDialogState extends State<MigrationDialog> {
               decoration: BoxDecoration(color: colors.error.useOpacity(0.15), borderRadius: BorderRadius.circular(8)),
               child: Text(_errorMessage!, style: text.smallParagraph?.copyWith(color: colors.textError)),
             ),
-          GlassButton.simple(
+          QuantusButton.simple(
             label: _errorMessage != null ? 'Retry' : 'Migrate Accounts',
             isLoading: _isMigrating,
             onTap: () async {
@@ -96,7 +96,7 @@ class _MigrationDialogState extends State<MigrationDialog> {
           ),
           if (_errorMessage != null) ...[
             const SizedBox(height: 12),
-            GlassButton.simple(
+            QuantusButton.simple(
               label: 'Try later',
               variant: ButtonVariant.transparent,
               onTap: () async {
diff --git a/mobile-app/lib/features/components/mnemonic_grid.dart b/mobile-app/lib/features/components/mnemonic_grid.dart
index 5ecf55907..cb5587373 100644
--- a/mobile-app/lib/features/components/mnemonic_grid.dart
+++ b/mobile-app/lib/features/components/mnemonic_grid.dart
@@ -1,9 +1,7 @@
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
-import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/shared/extensions/media_query_data_extension.dart';
-import 'package:resonance_network_wallet/v2/components/liquid_glass_base.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
 
@@ -47,32 +45,30 @@ class MnemonicGrid extends StatelessWidget {
   }
 
   Widget _buildMnemonicWord(int index, String word, bool isRevealed, BuildContext context) {
-    final padding = const EdgeInsets.symmetric(horizontal: 12);
+    final padding = const EdgeInsets.symmetric(horizontal: 10);
     final double blur = isRevealed ? 0 : 5;
     final effectiveWord = isRevealed ? word : 'x' * word.length;
 
-    return LiquidGlassBase.rounded(
-      glassColor: context.colors.surfaceGlass,
-      child: SizedBox(
-        height: double.infinity,
-        width: double.infinity,
-        child: Padding(
-          padding: padding,
-          child: Row(
-            children: [
-              Text(
-                '$index',
-                textAlign: TextAlign.left,
-                style: context.themeText.detail?.copyWith(color: context.colors.textPrimary.useOpacity(0.5)),
-              ),
-              const SizedBox(width: 8),
-              ImageFiltered(
-                imageFilter: ImageFilter.blur(sigmaX: blur, sigmaY: blur),
-                child: Text(effectiveWord, textAlign: TextAlign.left, style: context.themeText.detail),
-              ),
-            ],
+    return Container(
+      padding: padding,
+      decoration: BoxDecoration(color: context.colors.surfaceDeep, borderRadius: BorderRadius.circular(14)),
+      child: Row(
+        children: [
+          Text(
+            '$index',
+            textAlign: TextAlign.left,
+            style: context.themeText.detail?.copyWith(color: context.colors.textTertiary),
           ),
-        ),
+          const SizedBox(width: 8),
+          ImageFiltered(
+            imageFilter: ImageFilter.blur(sigmaX: blur, sigmaY: blur),
+            child: Text(
+              effectiveWord,
+              textAlign: TextAlign.left,
+              style: context.themeText.detail?.copyWith(color: context.colors.checksum),
+            ),
+          ),
+        ],
       ),
     );
   }
diff --git a/mobile-app/lib/features/components/pull_funds_confirmation_sheet.dart b/mobile-app/lib/features/components/pull_funds_confirmation_sheet.dart
index 3c198f33e..035580bf5 100644
--- a/mobile-app/lib/features/components/pull_funds_confirmation_sheet.dart
+++ b/mobile-app/lib/features/components/pull_funds_confirmation_sheet.dart
@@ -27,7 +27,6 @@ class PullFundsConfirmationSheet extends ConsumerStatefulWidget {
 }
 
 class _PullFundsConfirmationSheetState extends ConsumerState<PullFundsConfirmationSheet> {
-  final NumberFormattingService _formattingService = NumberFormattingService();
   BigInt? _fee;
   BigInt? _guardianBalance;
   bool _isLoading = true;
@@ -74,6 +73,8 @@ class _PullFundsConfirmationSheetState extends ConsumerState<PullFundsConfirmati
 
   @override
   Widget build(BuildContext context) {
+    final formattingService = ref.watch(numberFormattingServiceProvider);
+
     return SafeArea(
       bottom: false,
       child: Container(
@@ -118,7 +119,7 @@ class _PullFundsConfirmationSheetState extends ConsumerState<PullFundsConfirmati
               Column(
                 children: [
                   Text(
-                    'Fee: ${_formattingService.formatBalance(_fee!)} ${AppConstants.tokenSymbol}',
+                    'Fee: ${formattingService.formatBalance(_fee!)} ${AppConstants.tokenSymbol}',
                     textAlign: TextAlign.center,
                     style: context.themeText.smallTitle,
                   ),
diff --git a/mobile-app/lib/features/components/reversible_transaction_action_sheet.dart b/mobile-app/lib/features/components/reversible_transaction_action_sheet.dart
index 96e05cfbf..ef04518f3 100644
--- a/mobile-app/lib/features/components/reversible_transaction_action_sheet.dart
+++ b/mobile-app/lib/features/components/reversible_transaction_action_sheet.dart
@@ -10,13 +10,13 @@ import 'package:resonance_network_wallet/features/components/reversible_timer.da
 import 'package:resonance_network_wallet/features/styles/app_colors_theme.dart';
 import 'package:resonance_network_wallet/features/styles/app_size_theme.dart';
 import 'package:resonance_network_wallet/features/styles/app_text_theme.dart';
-import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
 import 'package:resonance_network_wallet/providers/all_transactions_provider.dart';
-import 'package:resonance_network_wallet/providers/filtered_all_transactions_provider.dart';
 import 'package:resonance_network_wallet/providers/pending_cancellations_provider.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/services/reversible_transfer_monitoring_service.dart';
 import 'package:resonance_network_wallet/shared/extensions/media_query_data_extension.dart';
 import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
+import 'package:resonance_network_wallet/shared/utils/tx_filter_family_provider.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 enum ReversibleTransactionMode { reversible, guardianIntercept }
@@ -46,7 +46,6 @@ class _ReversibleTransactionActionSheetState extends ConsumerState<ReversibleTra
   late Timer _timer;
   late Duration _remainingTime;
 
-  final NumberFormattingService _formattingService = NumberFormattingService();
   final SettingsService _settingsService = SettingsService();
   final ReversibleTransfersService _reversibleTransfersService = ReversibleTransfersService();
 
@@ -96,7 +95,8 @@ class _ReversibleTransactionActionSheetState extends ConsumerState<ReversibleTra
   }
 
   String _formatAmount(BigInt amount) {
-    return _formattingService.formatBalance(amount, addSymbol: true);
+    final numberFormattingService = ref.watch(numberFormattingServiceProvider);
+    return numberFormattingService.formatBalance(amount, addSymbol: true);
   }
 
   Widget _buildActionButton({
@@ -551,9 +551,9 @@ class _ReversibleTransactionActionSheetState extends ConsumerState<ReversibleTra
         // Filtered controllers for involved accounts
         final affectedAccounts = <String>{widget.transaction.from, widget.transaction.to};
         for (final accountId in affectedAccounts) {
-          ref
-              .read(filteredPaginationControllerProviderFamily(AccountIdListCache.get([accountId])).notifier)
-              .updateReversibleTransferToExecuted(extrinsicHash, ReversibleTransferStatus.CANCELLED);
+          updatePaginationFiltersFor(ref.read, [accountId], (notifier, _) {
+            notifier.updateReversibleTransferToExecuted(extrinsicHash, ReversibleTransferStatus.CANCELLED);
+          });
         }
 
         // 2) Start the aggressive poller to confirm final status promptly
diff --git a/mobile-app/lib/features/components/shared_address_action_sheet.dart b/mobile-app/lib/features/components/shared_address_action_sheet.dart
index e40481ee2..10587d134 100644
--- a/mobile-app/lib/features/components/shared_address_action_sheet.dart
+++ b/mobile-app/lib/features/components/shared_address_action_sheet.dart
@@ -9,7 +9,7 @@ import 'package:resonance_network_wallet/features/styles/app_colors_theme.dart';
 import 'package:resonance_network_wallet/features/styles/app_text_theme.dart';
 import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
 import 'package:resonance_network_wallet/shared/extensions/media_query_data_extension.dart';
-import 'package:resonance_network_wallet/v2/screens/send/send_sheet.dart';
+import 'package:resonance_network_wallet/v2/screens/send/input_amount_screen.dart';
 
 class SharedAddressActionSheet extends StatefulWidget {
   final String address;
@@ -58,7 +58,7 @@ class _SharedAddressActionSheetState extends State<SharedAddressActionSheet> {
 
   void _sendToAddress() {
     Navigator.of(context).pop();
-    showSendSheetV2(context, address: widget.address);
+    Navigator.push(context, MaterialPageRoute(builder: (_) => InputAmountScreen(recipientAddress: widget.address)));
   }
 
   void _closeSheet() {
diff --git a/mobile-app/lib/features/components/skeleton.dart b/mobile-app/lib/features/components/skeleton.dart
index f77bab1e0..65ae1bad3 100644
--- a/mobile-app/lib/features/components/skeleton.dart
+++ b/mobile-app/lib/features/components/skeleton.dart
@@ -25,6 +25,12 @@ class Skeleton extends StatefulWidget {
       height = size,
       borderRadius = null;
 
+  /// Creates a skeleton for a transaction item
+  const Skeleton.txItem({super.key, this.duration = const Duration(milliseconds: 1500)})
+    : width = double.infinity,
+      height = 40,
+      borderRadius = null;
+
   @override
   State<Skeleton> createState() => _SkeletonState();
 }
diff --git a/mobile-app/lib/features/components/transaction_details_action_sheet.dart b/mobile-app/lib/features/components/transaction_details_action_sheet.dart
index f6c514516..50ad95adc 100644
--- a/mobile-app/lib/features/components/transaction_details_action_sheet.dart
+++ b/mobile-app/lib/features/components/transaction_details_action_sheet.dart
@@ -15,6 +15,7 @@ import 'package:resonance_network_wallet/features/styles/app_size_theme.dart';
 import 'package:resonance_network_wallet/features/styles/app_text_theme.dart';
 import 'package:resonance_network_wallet/models/transaction_role.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/services/transaction_submission_service.dart';
 import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
 import 'package:resonance_network_wallet/shared/extensions/media_query_data_extension.dart';
@@ -346,7 +347,7 @@ class _TransactionDetailsActionSheetState extends ConsumerState<TransactionDetai
   }
 
   Widget _buildDetails() {
-    final NumberFormattingService formattingService = NumberFormattingService();
+    final formattingService = ref.watch(numberFormattingServiceProvider);
     final String formattedAmount = formattingService.formatBalance(widget.transaction.amount);
 
     return Column(
diff --git a/mobile-app/lib/features/components/transaction_list_item.dart b/mobile-app/lib/features/components/transaction_list_item.dart
index 80edd77ad..9abe98a5d 100644
--- a/mobile-app/lib/features/components/transaction_list_item.dart
+++ b/mobile-app/lib/features/components/transaction_list_item.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/features/components/skeleton.dart';
@@ -10,11 +11,12 @@ import 'package:resonance_network_wallet/features/styles/app_colors_theme.dart';
 import 'package:resonance_network_wallet/features/styles/app_size_theme.dart';
 import 'package:resonance_network_wallet/features/styles/app_text_theme.dart';
 import 'package:resonance_network_wallet/models/transaction_role.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/services/transaction_service.dart';
 import 'package:resonance_network_wallet/shared/extensions/media_query_data_extension.dart';
 import 'package:resonance_network_wallet/shared/extensions/transaction_event_extension.dart';
 
-class TransactionListItem extends StatefulWidget {
+class TransactionListItem extends ConsumerStatefulWidget {
   final TransactionEvent transaction;
   final TransactionRole role;
   final bool showFromAndTo;
@@ -32,7 +34,7 @@ class TransactionListItem extends StatefulWidget {
   TransactionListItemState createState() => TransactionListItemState();
 }
 
-class TransactionListItemState extends State<TransactionListItem> {
+class TransactionListItemState extends ConsumerState<TransactionListItem> {
   Timer? _timer;
   Duration? _remainingTime;
 
@@ -111,10 +113,9 @@ class TransactionListItemState extends State<TransactionListItem> {
     super.dispose();
   }
 
-  final NumberFormattingService _formattingService = NumberFormattingService();
-
   String _formatAmount(BigInt amount) {
-    return _formattingService.formatBalance(amount, addSymbol: true);
+    final formattingService = ref.watch(numberFormattingServiceProvider);
+    return formattingService.formatBalance(amount, addSymbol: true);
   }
 
   String _formatAddress(String address) {
diff --git a/mobile-app/lib/generated/version.g.dart b/mobile-app/lib/generated/version.g.dart
index de22746af..3bcb975b5 100644
--- a/mobile-app/lib/generated/version.g.dart
+++ b/mobile-app/lib/generated/version.g.dart
@@ -1,2 +1,2 @@
-const appVersion = '1.3.5';
-const appBuildNumber = '100';
+const appVersion = '1.4.0';
+const appBuildNumber = '101';
diff --git a/mobile-app/lib/models/fiat_currency.dart b/mobile-app/lib/models/fiat_currency.dart
new file mode 100644
index 000000000..8a4142b0a
--- /dev/null
+++ b/mobile-app/lib/models/fiat_currency.dart
@@ -0,0 +1,55 @@
+/// Fiat currencies the app can convert QUAN amounts into.
+///
+/// QUAN itself is not listed here — it is always the native side.
+/// Adding a new currency only requires a new enum case here and a matching
+/// rate in [ExchangeRateService]. No widget or provider changes are needed.
+enum FiatCurrency {
+  usd(code: 'USD', symbol: '\$', symbolPosition: SymbolPosition.prefix, fullName: 'United States Dollar', decimals: 2),
+  myr(code: 'MYR', symbol: 'RM', symbolPosition: SymbolPosition.prefix, fullName: 'Malaysian Ringgit', decimals: 2),
+  idr(code: 'IDR', symbol: 'Rp', symbolPosition: SymbolPosition.prefix, fullName: 'Indonesian Rupiah', decimals: 0),
+  jpy(code: 'JPY', symbol: '¥', symbolPosition: SymbolPosition.prefix, fullName: 'Japanese Yen', decimals: 0),
+  eur(code: 'EUR', symbol: '€', symbolPosition: SymbolPosition.prefix, fullName: 'Euro', decimals: 2),
+  gbp(code: 'GBP', symbol: '£', symbolPosition: SymbolPosition.prefix, fullName: 'British Pound', decimals: 2);
+
+  const FiatCurrency({
+    required this.code,
+    required this.symbol,
+    required this.symbolPosition,
+    required this.fullName,
+    required this.decimals,
+  });
+
+  /// ISO 4217 code, e.g. "USD", "IDR". Used for persistence and display.
+  final String code;
+
+  /// The display symbol, e.g. "$", "Rp", "¥".
+  final String symbol;
+
+  final SymbolPosition symbolPosition;
+
+  final String fullName;
+
+  /// Number of decimal places to display for this currency (ISO 4217 minor unit).
+  ///
+  /// Examples: USD/EUR/GBP → 2, IDR/JPY → 0.
+  final int decimals;
+
+  /// Wraps a pre-formatted numeric [amount] string with this currency's symbol.
+  ///
+  /// Example:
+  ///   FiatCurrency.usd.format('1,250.00')  →  '$1,250.00'
+  ///   FiatCurrency.idr.format('1,250')     →  'Rp1,250'
+  String format(String amount) => switch (symbolPosition) {
+    SymbolPosition.prefix => '$symbol$amount',
+    SymbolPosition.suffix => '$amount $symbol',
+  };
+
+  /// Looks up a [FiatCurrency] by its [code], returning [fallback] if not found.
+  static FiatCurrency fromCode(String code, {FiatCurrency fallback = FiatCurrency.usd}) {
+    return FiatCurrency.values.firstWhere((c) => c.code == code, orElse: () => fallback);
+  }
+
+  String get line => '$code - $fullName ($symbol)';
+}
+
+enum SymbolPosition { prefix, suffix }
diff --git a/mobile-app/lib/models/filtered_transactions_params.dart b/mobile-app/lib/models/filtered_transactions_params.dart
new file mode 100644
index 000000000..2e178d7c2
--- /dev/null
+++ b/mobile-app/lib/models/filtered_transactions_params.dart
@@ -0,0 +1,21 @@
+import 'package:quantus_sdk/quantus_sdk.dart';
+
+/// Immutable key used to parameterise the filtered-transactions provider family.
+///
+/// Riverpod family keys must implement [==] and [hashCode]; this class
+/// satisfies that requirement so every unique (accountIds, filter) combination
+/// gets its own isolated [StateNotifier].
+class FilteredTransactionsParams {
+  final List<String> accountIds;
+  final TransactionFilter filter;
+
+  const FilteredTransactionsParams({required this.accountIds, required this.filter});
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is FilteredTransactionsParams && identical(other.accountIds, accountIds) && other.filter == filter;
+
+  @override
+  int get hashCode => Object.hash(Object.hashAll(accountIds), filter);
+}
diff --git a/mobile-app/lib/models/notification_models.dart b/mobile-app/lib/models/notification_models.dart
index 54550d069..4796d2288 100644
--- a/mobile-app/lib/models/notification_models.dart
+++ b/mobile-app/lib/models/notification_models.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:quantus_sdk/quantus_sdk.dart';
 
 /// Notification types as specified in requirements
@@ -360,7 +362,8 @@ class NotificationTemplates {
   }
 
   static String _formatAmount(BigInt amount) {
-    final NumberFormattingService formattingService = NumberFormattingService();
+    final localeConfig = LocaleNumberConfig.fromLocale(Platform.localeName);
+    final NumberFormattingService formattingService = NumberFormattingService(localeConfig: localeConfig);
     return formattingService.formatBalance(amount, addSymbol: true);
   }
 
diff --git a/mobile-app/lib/providers/account_providers.dart b/mobile-app/lib/providers/account_providers.dart
index 91aa59104..822d306a6 100644
--- a/mobile-app/lib/providers/account_providers.dart
+++ b/mobile-app/lib/providers/account_providers.dart
@@ -34,7 +34,7 @@ class AccountsNotifier extends StateNotifier<AsyncValue<List<Account>>> {
     state.whenData((accounts) async {
       try {
         await _accountsService.removeAccount(account);
-        final newAccounts = accounts.where((a) => a.index != account.index).toList();
+        final newAccounts = accounts.where((a) => a.accountId != account.accountId).toList();
         state = AsyncValue.data(newAccounts);
       } catch (e, st) {
         print('remove account error $e $st');
diff --git a/mobile-app/lib/providers/active_account_transactions_provider.dart b/mobile-app/lib/providers/active_account_transactions_provider.dart
index a7cb70e87..0cbbc8f58 100644
--- a/mobile-app/lib/providers/active_account_transactions_provider.dart
+++ b/mobile-app/lib/providers/active_account_transactions_provider.dart
@@ -1,30 +1,31 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/models/combined_transactions_list.dart';
+import 'package:resonance_network_wallet/models/filtered_transactions_params.dart';
 import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/providers/filtered_all_transactions_provider.dart';
 
-/// Provides a list of transactions for the currently active account.
+/// Provides a filtered list of transactions for the currently active account.
 ///
-/// This provider handles the logic of watching the active account and fetching
-/// the appropriate transaction list. It returns an [AsyncValue] that can be
-/// in a loading, data, or error state.
-final activeAccountTransactionsProvider = Provider<AsyncValue<CombinedTransactionsList>>((ref) {
+/// Parameterised by [TransactionFilter] so callers can independently watch
+/// the send-only, receive-only, or combined history.
+final activeAccountTransactionsProvider = Provider.family<AsyncValue<CombinedTransactionsList>, TransactionFilter>((
+  ref,
+  filter,
+) {
   final activeAccountValue = ref.watch(activeAccountProvider);
 
   return activeAccountValue.when(
     data: (activeAccount) {
       if (activeAccount == null) {
-        return AsyncValue.data(
-          CombinedTransactionsList(
-            pendingCancellationIds: <String>{},
-            pendingTransactions: [],
-            scheduledReversibleTransfers: [],
-            otherTransfers: [],
-          ),
-        );
+        return AsyncValue.data(CombinedTransactionsList.empty);
       }
-      return ref.watch(filteredTransactionsProviderFamily(AccountIdListCache.get([activeAccount.account.accountId])));
+      final params = FilteredTransactionsParams(
+        accountIds: AccountIdListCache.get([activeAccount.account.accountId]),
+        filter: filter,
+      );
+      return ref.watch(filteredTransactionsProviderFamily(params));
     },
     loading: () => const AsyncValue.loading(),
     error: (err, stack) => AsyncValue.error(err, stack),
diff --git a/mobile-app/lib/providers/controllers/unified_pagination_controller.dart b/mobile-app/lib/providers/controllers/unified_pagination_controller.dart
index 157c8fbde..358a2020a 100644
--- a/mobile-app/lib/providers/controllers/unified_pagination_controller.dart
+++ b/mobile-app/lib/providers/controllers/unified_pagination_controller.dart
@@ -9,9 +9,14 @@ import 'package:resonance_network_wallet/providers/connectivity_provider.dart';
 /// Unified pagination controller that handles both all-accounts and
 /// filtered-accounts scenarios
 class UnifiedPaginationController extends StateNotifier<PaginationState> {
-  UnifiedPaginationController(this.ref, {this.accountIds, int pageLimit = 20})
-    : _limit = pageLimit,
-      super(PaginationState.initial()) {
+  UnifiedPaginationController(
+    this.ref, {
+    this.accountIds,
+    int pageLimit = 20,
+    TransactionFilter filter = TransactionFilter.all,
+  }) : _limit = pageLimit,
+       _filter = filter,
+       super(PaginationState.initial()) {
     if (accountIds == null) {
       _listenToAccounts();
     }
@@ -21,6 +26,7 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
   final Ref ref;
   final List<String>? accountIds; // If null, load all accounts from provider
   final int _limit;
+  final TransactionFilter _filter;
 
   void _listenToAccounts() {
     ref.listen(accountsProvider, (previous, next) {
@@ -78,6 +84,7 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
             limit: _limit,
             otherOffset: state.otherOffset,
             scheduledOffset: state.scheduledOffset,
+            filter: _filter,
           );
 
       final newOtherTransfers = newTransactions.otherTransfers;
@@ -149,7 +156,7 @@ class UnifiedPaginationController extends StateNotifier<PaginationState> {
     try {
       final newTransactions = await ref
           .read(chainHistoryServiceProvider)
-          .fetchAllTransactionTypes(accountIds: targetAccountIds, limit: _limit);
+          .fetchAllTransactionTypes(accountIds: targetAccountIds, limit: _limit, filter: _filter);
 
       final newOtherTransfers = newTransactions.otherTransfers;
       final newScheduledReversibleTransfers = newTransactions.scheduledReversibleTransfers;
diff --git a/mobile-app/lib/providers/currency_display_provider.dart b/mobile-app/lib/providers/currency_display_provider.dart
new file mode 100644
index 000000000..74b89ae5d
--- /dev/null
+++ b/mobile-app/lib/providers/currency_display_provider.dart
@@ -0,0 +1,371 @@
+import 'dart:convert';
+
+import 'package:decimal/decimal.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/models/fiat_currency.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
+import 'package:resonance_network_wallet/services/exchange_rate_service.dart';
+
+// ---------------------------------------------------------------------------
+// Exchange rate caching helpers
+// ---------------------------------------------------------------------------
+
+const _kRatesCacheKey = 'exchange_rates_cache';
+
+/// Parses the inner `rates` object from a decoded cache payload into a
+/// `Map<String, Decimal>`. Shared by [_readRatesCache] and [_readRatesCacheAnyAge].
+Map<String, Decimal> _parseRatesMap(Map<String, dynamic> ratesJson) =>
+    ratesJson.map((k, v) => MapEntry(k, Decimal.parse(v as String)));
+
+/// Reads persisted rates from [settings] and returns them only when the cache
+/// has not yet expired. Returns `null` on a cache miss, parse error, or expiry.
+Map<String, Decimal>? _readRatesCache(SettingsService settings) {
+  final raw = settings.getString(_kRatesCacheKey);
+  if (raw == null) return null;
+  try {
+    final decoded = jsonDecode(raw) as Map<String, dynamic>;
+    final expiryUnix = decoded['expiry'] as int;
+    final nowUnix = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+    if (nowUnix >= expiryUnix) return null;
+    return _parseRatesMap(decoded['rates'] as Map<String, dynamic>);
+  } catch (e) {
+    debugPrint('Failed parsing exchange rates: $e');
+    return null;
+  }
+}
+
+/// Like [_readRatesCache] but ignores expiry — used as a last-resort fallback
+/// while a network fetch is in progress or has failed.
+///
+/// Returns [ExchangeRateService.fallbackRates] when SharedPreferences has no
+/// entry (fresh install) or when the stored data cannot be parsed, so callers
+/// always get a usable map and never throw.
+Map<String, Decimal> _readRatesCacheAnyAge(SettingsService settings) {
+  final raw = settings.getString(_kRatesCacheKey);
+  if (raw == null) return ExchangeRateService.fallbackRates;
+
+  try {
+    final decoded = jsonDecode(raw) as Map<String, dynamic>;
+    return _parseRatesMap(decoded['rates'] as Map<String, dynamic>);
+  } catch (e) {
+    debugPrint('Failed parsing exchange rates cache: $e');
+
+    return ExchangeRateService.fallbackRates;
+  }
+}
+
+/// Minimum acceptable cache window. Guards against an upstream returning a
+/// stale or zero `time_next_update_unix`, which would otherwise cause every
+/// cold start to re-hit the network.
+const _kMinCacheTtlSeconds = 60;
+
+Future<void> _writeRatesCache(SettingsService settings, Map<String, Decimal> rates, int timeNextUpdateUnix) async {
+  final nowUnix = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+  if (timeNextUpdateUnix <= nowUnix + _kMinCacheTtlSeconds) {
+    debugPrint(
+      'Skipping exchange rates cache write: timeNextUpdateUnix=$timeNextUpdateUnix '
+      'is not at least ${_kMinCacheTtlSeconds}s in the future (now=$nowUnix).',
+    );
+    return;
+  }
+  final payload = {'expiry': timeNextUpdateUnix, 'rates': rates.map((k, v) => MapEntry(k, v.toString()))};
+  await settings.setString(_kRatesCacheKey, jsonEncode(payload));
+}
+
+// ---------------------------------------------------------------------------
+// Exchange rates provider (async fetch + server-driven cache)
+// ---------------------------------------------------------------------------
+
+/// Resolves the live USD-based exchange rates.
+///
+/// Strategy (in order):
+///   1. Return valid (non-expired) cached rates from the previous fetch.
+///   2. Fetch fresh rates from the Taskmaster endpoint and persist them.
+///      The cache expiry is set to [time_next_update_unix] from the API
+///      response, so the cache is busted exactly when the upstream provider
+///      publishes new rates rather than after an arbitrary local TTL.
+///   3. On fetch error, return the last persisted rates (even if expired).
+///   4. Ultimate fallback: [ExchangeRateService.fallbackRates].
+final exchangeRatesProvider = FutureProvider<Map<String, Decimal>>((ref) async {
+  final settings = ref.read(settingsServiceProvider);
+
+  final cached = _readRatesCache(settings);
+  if (cached != null) return cached;
+
+  try {
+    final result = await TaskmasterService().getExchangeRates();
+    final rates = result.rates.map((k, v) => MapEntry(k, Decimal.parse(v.toString())));
+    await _writeRatesCache(settings, rates, result.timeNextUpdateUnix);
+
+    return rates;
+  } catch (e) {
+    debugPrint('Failed fetching exchange rates: $e');
+
+    return _readRatesCacheAnyAge(settings);
+  }
+});
+
+// ---------------------------------------------------------------------------
+// Exchange rate service provider
+// ---------------------------------------------------------------------------
+
+/// Returns an [ExchangeRateService] backed by the best available rates.
+///
+/// • While [exchangeRatesProvider] is loading, uses the last persisted rates
+///   (any age) so the UI always shows something meaningful.
+/// • Once live rates arrive, rebuilds with the fresh data.
+final exchangeRateServiceProvider = Provider<ExchangeRateService>((ref) {
+  final ratesAsync = ref.watch(exchangeRatesProvider);
+  final settings = ref.read(settingsServiceProvider);
+
+  return ratesAsync.when(
+    data: (rates) => ExchangeRateService(rates: rates),
+    loading: () => ExchangeRateService(rates: _readRatesCacheAnyAge(settings)),
+    error: (_, _) => ExchangeRateService(rates: _readRatesCacheAnyAge(settings)),
+  );
+});
+
+// ---------------------------------------------------------------------------
+// Selected fiat currency provider
+// ---------------------------------------------------------------------------
+
+/// Persists and exposes the user's chosen fiat currency for conversions.
+/// Defaults to [FiatCurrency.usd] when no preference has been saved.
+///
+/// To change the active fiat currency (e.g. from a settings screen):
+///   ref.read(selectedFiatCurrencyProvider.notifier).select(FiatCurrency.idr);
+final selectedFiatCurrencyProvider = StateNotifierProvider<SelectedFiatCurrencyNotifier, FiatCurrency>((ref) {
+  final settings = ref.watch(settingsServiceProvider);
+  return SelectedFiatCurrencyNotifier(settings);
+});
+
+class SelectedFiatCurrencyNotifier extends StateNotifier<FiatCurrency> {
+  final SettingsService _settings;
+
+  SelectedFiatCurrencyNotifier(this._settings) : super(_load(_settings));
+
+  /// Persists and applies [currency] as the active fiat currency.
+  Future<void> select(FiatCurrency currency) async {
+    await _settings.setSelectedFiatCurrency(currency.code);
+    state = currency;
+  }
+
+  static FiatCurrency _load(SettingsService settings) {
+    final code = settings.getSelectedFiatCurrency();
+    if (code == null) return FiatCurrency.usd;
+    return FiatCurrency.fromCode(code);
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Currency flip provider
+// ---------------------------------------------------------------------------
+
+/// Whether fiat is shown as the primary (large) display and QUAN secondary.
+///
+/// false → primary = QUAN,  secondary = fiat  (default)
+/// true  → primary = fiat,  secondary = QUAN
+///
+/// To toggle from the swap button:
+///   ref.read(isCurrencyFlippedProvider.notifier).toggle();
+final isCurrencyFlippedProvider = StateNotifierProvider<IsCurrencyFlippedNotifier, bool>((ref) {
+  final settings = ref.watch(settingsServiceProvider);
+  return IsCurrencyFlippedNotifier(settings);
+});
+
+class IsCurrencyFlippedNotifier extends StateNotifier<bool> {
+  final SettingsService _settings;
+
+  IsCurrencyFlippedNotifier(this._settings) : super(_settings.isCurrencyFlipped());
+
+  Future<void> toggle() async {
+    final next = !state;
+    await _settings.setCurrencyFlipped(next);
+    state = next;
+  }
+
+  Future<void> setFlipped(bool value) async {
+    await _settings.setCurrencyFlipped(value);
+    state = value;
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Display state
+// ---------------------------------------------------------------------------
+
+/// The fully-resolved display state for the active account's balance.
+///
+/// Widgets render [primaryAmount] and [secondaryAmount] directly.
+/// No conversion math belongs in widgets.
+class CurrencyDisplayState {
+  final String primaryAmount;
+  final String secondaryAmount;
+  final bool isFlipped;
+  final FiatCurrency selectedFiat;
+
+  const CurrencyDisplayState({
+    required this.primaryAmount,
+    required this.secondaryAmount,
+    required this.isFlipped,
+    required this.selectedFiat,
+  });
+
+  CurrencyDisplayState copyWith({
+    String? primaryAmount,
+    String? secondaryAmount,
+    bool? isFlipped,
+    FiatCurrency? selectedFiat,
+  }) => CurrencyDisplayState(
+    primaryAmount: primaryAmount ?? this.primaryAmount,
+    secondaryAmount: secondaryAmount ?? this.secondaryAmount,
+    isFlipped: isFlipped ?? this.isFlipped,
+    selectedFiat: selectedFiat ?? this.selectedFiat,
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Balance display provider
+// ---------------------------------------------------------------------------
+
+final _hiddenAmountText = '-----';
+
+/// Combines balance, hidden state, flip state, selected fiat, and exchange
+/// rate into [CurrencyDisplayState] ready for widgets to render.
+final balanceDisplayProvider = Provider<AsyncValue<CurrencyDisplayState>>((ref) {
+  final balanceAsync = ref.watch(balanceProvider);
+  final isHidden = ref.watch(isBalanceHiddenProvider);
+  final isFlipped = ref.watch(isCurrencyFlippedProvider);
+  final selectedFiat = ref.watch(selectedFiatCurrencyProvider);
+  final xRate = ref.watch(exchangeRateServiceProvider);
+  final fmt = ref.watch(numberFormattingServiceProvider);
+  final localeConfig = ref.watch(localeNumberConfigProvider);
+
+  return balanceAsync.when(
+    loading: () => const AsyncValue.loading(),
+    error: (err, stack) => AsyncValue.error(err, stack),
+    data: (balance) {
+      CurrencyDisplayState data = _toFiatDisplayState(
+        balance,
+        selectedFiat,
+        xRate,
+        fmt,
+        _hiddenAmountText,
+        quanDecimals: 3,
+        isFlipped: isFlipped,
+        isHidden: isHidden,
+        withQuanSymbol: false,
+        localeConfig: localeConfig,
+      );
+      return AsyncValue.data(data);
+    },
+  );
+});
+
+// ---------------------------------------------------------------------------
+// Per-amount display provider (for transaction items)
+// ---------------------------------------------------------------------------
+
+final txAmountDisplayProvider =
+    Provider<
+      CurrencyDisplayState Function(
+        BigInt, {
+        required bool isSend,
+        int quanDecimals,
+        bool withQuanSymbol,
+        bool withSignPrefix,
+        String? customHiddenText,
+      })
+    >((ref) {
+      final isHidden = ref.watch(isBalanceHiddenProvider);
+      final isFlipped = ref.watch(isCurrencyFlippedProvider);
+      final selectedFiat = ref.watch(selectedFiatCurrencyProvider);
+      final xRate = ref.watch(exchangeRateServiceProvider);
+      final fmt = ref.watch(numberFormattingServiceProvider);
+      final localeConfig = ref.watch(localeNumberConfigProvider);
+
+      return (
+        BigInt amount, {
+        required bool isSend,
+        bool withQuanSymbol = true,
+        bool withSignPrefix = true,
+        int quanDecimals = 2,
+        String? customHiddenText,
+      }) {
+        final hiddenText = customHiddenText ?? _hiddenAmountText;
+        final prefix = isSend ? '-' : '+';
+
+        CurrencyDisplayState data = _toFiatDisplayState(
+          amount,
+          selectedFiat,
+          xRate,
+          fmt,
+          hiddenText,
+          quanDecimals: quanDecimals,
+          isHidden: isHidden,
+          withQuanSymbol: withQuanSymbol,
+          isFlipped: isFlipped,
+          localeConfig: localeConfig,
+        );
+
+        if (!isHidden) {
+          data = data.copyWith(primaryAmount: withSignPrefix ? '$prefix${data.primaryAmount}' : data.primaryAmount);
+        }
+
+        if (!withQuanSymbol && isFlipped && !isHidden) {
+          data = data.copyWith(secondaryAmount: '${data.secondaryAmount} ${AppConstants.tokenSymbol}');
+        }
+
+        return data;
+      };
+    });
+
+// ---------------------------------------------------------------------------
+// Internal helpers
+// ---------------------------------------------------------------------------
+
+/// Converts [rawBalance] to a fiat numeric string with the number of decimal
+/// places prescribed by [fiat] (e.g. 2 for USD, 0 for JPY/IDR).
+/// When [localeConfig] is provided, the output uses locale-appropriate separators.
+String _toFiatNumeric(
+  BigInt rawBalance,
+  FiatCurrency fiat,
+  ExchangeRateService xRate, {
+  required LocaleNumberConfig localeConfig,
+}) {
+  final fiatValue = xRate.quanRawToFiat(rawBalance, fiat, AppConstants.decimals);
+  final canonical = fiatValue.toStringAsFixed(fiat.decimals);
+
+  return localeConfig.localize(canonical);
+}
+
+CurrencyDisplayState _toFiatDisplayState(
+  BigInt amount,
+  FiatCurrency selectedFiat,
+  ExchangeRateService xRate,
+  NumberFormattingService fmt,
+  String hiddenText, {
+  required int quanDecimals,
+  required bool isFlipped,
+  required bool isHidden,
+  required bool withQuanSymbol,
+  required LocaleNumberConfig localeConfig,
+}) {
+  final quanFormatted = fmt.formatBalance(amount, maxDecimals: quanDecimals, addSymbol: withQuanSymbol);
+  final fiatFormatted = selectedFiat.format(_toFiatNumeric(amount, selectedFiat, xRate, localeConfig: localeConfig));
+
+  CurrencyDisplayState data = CurrencyDisplayState(
+    primaryAmount: isFlipped ? fiatFormatted : quanFormatted,
+    secondaryAmount: isFlipped ? quanFormatted : fiatFormatted,
+    isFlipped: isFlipped,
+    selectedFiat: selectedFiat,
+  );
+
+  if (isHidden) {
+    data = data.copyWith(primaryAmount: hiddenText, secondaryAmount: hiddenText);
+  }
+
+  return data;
+}
diff --git a/mobile-app/lib/providers/filtered_all_transactions_provider.dart b/mobile-app/lib/providers/filtered_all_transactions_provider.dart
index 5ab7e3cb1..b2960fc52 100644
--- a/mobile-app/lib/providers/filtered_all_transactions_provider.dart
+++ b/mobile-app/lib/providers/filtered_all_transactions_provider.dart
@@ -1,44 +1,58 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/models/combined_transactions_list.dart';
+import 'package:resonance_network_wallet/models/filtered_transactions_params.dart';
 import 'package:resonance_network_wallet/models/pagination_state.dart';
 import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
 import 'package:resonance_network_wallet/providers/controllers/unified_pagination_controller.dart';
 import 'package:resonance_network_wallet/providers/pending_cancellations_provider.dart';
 import 'package:resonance_network_wallet/providers/pending_transactions_provider.dart';
 
-/// Family provider for filtered pagination controllers
+/// Family provider for filtered pagination controllers.
+///
+/// Keyed on [FilteredTransactionsParams] so each unique (accountIds, filter)
+/// combination owns its own [UnifiedPaginationController] instance and
+/// independently cached page data.
 final filteredPaginationControllerProviderFamily =
-    StateNotifierProvider.family<UnifiedPaginationController, PaginationState, List<String>>(
-      (ref, accountIds) => UnifiedPaginationController(ref, accountIds: accountIds),
+    StateNotifierProvider.family<UnifiedPaginationController, PaginationState, FilteredTransactionsParams>(
+      (ref, params) => UnifiedPaginationController(ref, accountIds: params.accountIds, filter: params.filter),
     );
 
-/// Combined provider for filtered transactions (similar to
-/// allTransactionsProvider)
-final filteredTransactionsProviderFamily = Provider.family<AsyncValue<CombinedTransactionsList>, List<String>>((
-  ref,
-  accountIds,
-) {
-  final pendingCancellationIds = ref.watch(pendingCancellationsProvider);
-  final pending = ref.watch(pendingTransactionsProvider);
-  final pagination = ref.watch(filteredPaginationControllerProviderFamily(AccountIdListCache.get(accountIds)));
+/// Combined provider for filtered transactions.
+final filteredTransactionsProviderFamily =
+    Provider.family<AsyncValue<CombinedTransactionsList>, FilteredTransactionsParams>((ref, params) {
+      final normalizedParams = FilteredTransactionsParams(
+        accountIds: AccountIdListCache.get(params.accountIds),
+        filter: params.filter,
+      );
 
-  if (pagination.error != null) {
-    print('FilteredTransactionsProvider: Error: ${pagination.error}');
-    return AsyncValue.error(pagination.error!, pagination.stackTrace!);
-  }
-  if (pagination.isFetching && pagination.otherTransfers.isEmpty) {
-    return const AsyncValue.loading();
-  }
+      final pendingCancellationIds = ref.watch(pendingCancellationsProvider);
+      final pending = ref.watch(pendingTransactionsProvider);
+      final pagination = ref.watch(filteredPaginationControllerProviderFamily(normalizedParams));
 
-  // Filter pending transactions based on account selection
-  final filteredPending = pending.where((tx) => accountIds.contains(tx.from) || accountIds.contains(tx.to)).toList();
+      if (pagination.error != null) {
+        print('FilteredTransactionsProvider: Error: ${pagination.error}');
+        return AsyncValue.error(pagination.error!, pagination.stackTrace!);
+      }
+      if (pagination.isFetching && pagination.otherTransfers.isEmpty) {
+        return const AsyncValue.loading();
+      }
 
-  return AsyncValue.data(
-    CombinedTransactionsList(
-      pendingCancellationIds: pendingCancellationIds,
-      pendingTransactions: filteredPending,
-      scheduledReversibleTransfers: pagination.scheduledReversibleTransfers,
-      otherTransfers: pagination.otherTransfers,
-    ),
-  );
-});
+      final accountIds = params.accountIds;
+      final filteredPending = pending
+          .where(
+            (tx) =>
+                normalizedParams.filter != TransactionFilter.receive &&
+                (accountIds.contains(tx.from) || accountIds.contains(tx.to)),
+          )
+          .toList();
+
+      return AsyncValue.data(
+        CombinedTransactionsList(
+          pendingCancellationIds: pendingCancellationIds,
+          pendingTransactions: filteredPending,
+          scheduledReversibleTransfers: pagination.scheduledReversibleTransfers,
+          otherTransfers: pagination.otherTransfers,
+        ),
+      );
+    });
diff --git a/mobile-app/lib/providers/wallet_providers.dart b/mobile-app/lib/providers/wallet_providers.dart
index 3cc739007..7ee0fd05c 100644
--- a/mobile-app/lib/providers/wallet_providers.dart
+++ b/mobile-app/lib/providers/wallet_providers.dart
@@ -1,3 +1,5 @@
+import 'dart:io' show Platform;
+
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
@@ -19,8 +21,20 @@ final substrateServiceProvider = Provider<SubstrateService>((ref) {
   return SubstrateService();
 });
 
+final recentAddressesServiceProvider = Provider<RecentAddressesService>((ref) {
+  return RecentAddressesService();
+});
+
+/// Caveat: snapshots [Platform.localeName] at provider creation time.
+/// A mid-session locale change (rare) won't be picked up until app restart.
+final localeNumberConfigProvider = Provider<LocaleNumberConfig>((ref) {
+  return LocaleNumberConfig.fromLocale(Platform.localeName);
+});
+
 final numberFormattingServiceProvider = Provider<NumberFormattingService>((ref) {
-  return NumberFormattingService();
+  final localeConfig = ref.watch(localeNumberConfigProvider);
+
+  return NumberFormattingService(localeConfig: localeConfig);
 });
 
 final humanReadableChecksumServiceProvider = Provider<HumanReadableChecksumService>((ref) {
diff --git a/mobile-app/lib/services/exchange_rate_service.dart b/mobile-app/lib/services/exchange_rate_service.dart
new file mode 100644
index 000000000..511d9bcf8
--- /dev/null
+++ b/mobile-app/lib/services/exchange_rate_service.dart
@@ -0,0 +1,68 @@
+import 'package:decimal/decimal.dart';
+import 'package:resonance_network_wallet/models/fiat_currency.dart';
+
+/// Provides QUAN → fiat exchange rates.
+///
+/// Constructed with a live [rates] map (ISO-4217 code → value in that currency
+/// per 1 USD). Falls back to [fallbackRates] for any code not present.
+///
+/// [quanToUsdRate] defaults to `1` (1 QUAN = 1 USD). Wire a dedicated QUAN
+/// price feed into this field when one becomes available.
+class ExchangeRateService {
+  /// Static rates used before any live or cached data is available (e.g. on
+  /// fresh install with no network). Values are approximate and intentionally
+  /// conservative — they are replaced by real rates as soon as the first
+  /// successful fetch completes.
+  static final Map<String, Decimal> fallbackRates = {
+    'USD': Decimal.parse('1'),
+    'MYR': Decimal.parse('3.97'),
+    'IDR': Decimal.parse('17337.90'),
+    'JPY': Decimal.parse('156.54'),
+    'EUR': Decimal.parse('0.85'),
+    'GBP': Decimal.parse('0.73'),
+  };
+
+  final Map<String, Decimal> _rates;
+  final Decimal quanToUsdRate;
+
+  ExchangeRateService({required Map<String, Decimal> rates, Decimal? quanToUsdRate})
+    : _rates = rates,
+      quanToUsdRate = quanToUsdRate ?? Decimal.one;
+
+  /// Returns the exchange rate for [fiat] (units per 1 USD).
+  Decimal getRate(FiatCurrency fiat) {
+    final rate = _rates[fiat.code] ?? fallbackRates[fiat.code];
+    if (rate == null) throw Exception('Exchange rate not found for ${fiat.code}!');
+
+    return rate;
+  }
+
+  /// Converts [quanAmount] to [fiat] using the current rates.
+  Decimal convert(Decimal quanAmount, FiatCurrency fiat) {
+    final result = (quanAmount * quanToUsdRate * getRate(fiat));
+    // Round to fiat precision to ensure stable round-trips
+    return Decimal.parse(result.toStringAsFixed(fiat.decimals));
+  }
+
+  /// Converts a raw QUAN [BigInt] (scaled by 10^[quanDecimals]) to a fiat [Decimal].
+  ///
+  /// Centralises the scale-factor arithmetic so both display providers and the
+  /// send screen share a single, testable conversion path.
+  Decimal quanRawToFiat(BigInt rawQuan, FiatCurrency fiat, int quanDecimals) {
+    final scaleFactor = BigInt.from(10).pow(quanDecimals);
+    final quanDecimal = (Decimal.fromBigInt(rawQuan) / Decimal.fromBigInt(scaleFactor)).toDecimal();
+    return convert(quanDecimal, fiat);
+  }
+
+  /// Converts a [fiatAmount] back to raw QUAN [BigInt] scaled by 10^[quanDecimals].
+  ///
+  /// Uses the inverse of [convert]: fiat / (quanToUsdRate × rate).
+  /// Returns [BigInt.zero] when the effective rate is zero.
+  BigInt fiatToQuanRaw(Decimal fiatAmount, FiatCurrency fiat, int quanDecimals) {
+    final effectiveRate = quanToUsdRate * getRate(fiat);
+    if (effectiveRate == Decimal.zero) return BigInt.zero;
+    final scaleFactor = Decimal.fromBigInt(BigInt.from(10).pow(quanDecimals));
+    final quanDecimal = (fiatAmount / effectiveRate).toDecimal(scaleOnInfinitePrecision: quanDecimals);
+    return (quanDecimal * scaleFactor).toBigInt();
+  }
+}
diff --git a/mobile-app/lib/services/global_history_polling_service.dart b/mobile-app/lib/services/global_history_polling_service.dart
index a8e9a7a07..a9d125113 100644
--- a/mobile-app/lib/services/global_history_polling_service.dart
+++ b/mobile-app/lib/services/global_history_polling_service.dart
@@ -1,14 +1,13 @@
 import 'dart:async';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/providers/all_transactions_provider.dart';
-import 'package:resonance_network_wallet/providers/filtered_all_transactions_provider.dart';
 import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/providers/connectivity_provider.dart';
 import 'package:resonance_network_wallet/services/pending_transaction_reconciliation_service.dart';
 import 'package:resonance_network_wallet/services/telemetry_service.dart';
+import 'package:resonance_network_wallet/shared/utils/tx_filter_family_provider.dart';
 
 /// Service that handles global history polling - refreshes transaction history
 /// every minute to keep the UI up to date with the latest blockchain state.
@@ -90,12 +89,16 @@ class GlobalHistoryPollingService {
       // and active filtered
       _ref.read(paginationControllerProvider.notifier).silentRefresh();
       final accountIds = _ref.read(accountsProvider).value?.map((a) => a.accountId).toList() ?? [];
-      for (var id in accountIds) {
-        _ref.read(filteredPaginationControllerProviderFamily(AccountIdListCache.get([id])).notifier).silentRefresh();
+      final targetIds = [
+        ...accountIds.map((id) => [id]),
+        accountIds,
+      ];
+
+      for (final ids in targetIds) {
+        updatePaginationFiltersFor(_ref.read, ids, (notifier, _) {
+          notifier.silentRefresh();
+        });
       }
-      _ref
-          .read(filteredPaginationControllerProviderFamily(AccountIdListCache.get(accountIds)).notifier)
-          .silentRefresh();
 
       // Reconcile pending transactions with confirmed transactions
       _ref.read(pendingTransactionReconciliationServiceProvider).reconcilePendingTransactions();
@@ -125,9 +128,9 @@ class GlobalHistoryPollingService {
     await _ref.read(paginationControllerProvider.notifier).loadingRefresh();
     final active = _ref.read(activeAccountProvider).value;
     if (active != null) {
-      await _ref
-          .read(filteredPaginationControllerProviderFamily(AccountIdListCache.get([active.account.accountId])).notifier)
-          .loadingRefresh();
+      updatePaginationFiltersFor(_ref.read, [active.account.accountId], (notifier, _) {
+        notifier.loadingRefresh();
+      });
     }
 
     // Also reconcile pending transactions during manual refresh
diff --git a/mobile-app/lib/services/pending_transaction_polling_service.dart b/mobile-app/lib/services/pending_transaction_polling_service.dart
index 97f14991b..bdc6c68d4 100644
--- a/mobile-app/lib/services/pending_transaction_polling_service.dart
+++ b/mobile-app/lib/services/pending_transaction_polling_service.dart
@@ -2,12 +2,11 @@ import 'dart:async';
 
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/providers/all_transactions_provider.dart';
-import 'package:resonance_network_wallet/providers/filtered_all_transactions_provider.dart';
 import 'package:resonance_network_wallet/providers/pending_transactions_provider.dart';
 import 'package:resonance_network_wallet/providers/wallet_providers.dart';
+import 'package:resonance_network_wallet/shared/utils/tx_filter_family_provider.dart';
 
 class PendingTransactionPollingService {
   final Ref _ref;
@@ -122,24 +121,28 @@ void triggerSilentHistoryRefresh(Ref ref, {required Set<String> affectedAccountI
     if (newTransaction != null) mainController.addTransactionToHistory(newTransaction);
     mainController.silentRefresh();
 
-    final targets = <String>{...affectedAccountIds};
+    final targets = affectedAccountIds.map((id) => [id]).toList();
     final active = ref.read(activeAccountProvider).value;
-    if (active != null) targets.add(active.account.accountId);
+    if (active != null) targets.add([active.account.accountId]);
 
-    for (final accountId in targets) {
-      final controller = ref.read(
-        filteredPaginationControllerProviderFamily(AccountIdListCache.get([accountId])).notifier,
-      );
-      if (newTransaction != null) controller.addTransactionToHistory(newTransaction);
-      controller.silentRefresh();
+    final accountIds = ref.read(accountsProvider).value?.map((a) => a.accountId).toList() ?? [];
+    if (accountIds.isNotEmpty) {
+      targets.add(accountIds);
     }
 
-    final accountIds = ref.read(accountsProvider).value?.map((a) => a.accountId).toList() ?? [];
-    final allController = ref.read(
-      filteredPaginationControllerProviderFamily(AccountIdListCache.get(accountIds)).notifier,
-    );
-    if (newTransaction != null) allController.addTransactionToHistory(newTransaction);
-    allController.silentRefresh();
+    for (final targetIds in targets) {
+      if (newTransaction != null) {
+        updatePaginationFiltersFor(ref.read, targetIds, (notifier, filter) {
+          if (filter != TransactionFilter.receive) {
+            notifier.addTransactionToHistory(newTransaction);
+          }
+        });
+      }
+
+      updatePaginationFiltersFor(ref.read, targetIds, (notifier, _) {
+        notifier.silentRefresh();
+      });
+    }
   } catch (e) {
     print('[SilentHistoryRefresh] Error: $e');
   }
diff --git a/mobile-app/lib/services/reversible_transfer_monitoring_service.dart b/mobile-app/lib/services/reversible_transfer_monitoring_service.dart
index a8ba4ddfe..0c5193df6 100644
--- a/mobile-app/lib/services/reversible_transfer_monitoring_service.dart
+++ b/mobile-app/lib/services/reversible_transfer_monitoring_service.dart
@@ -4,13 +4,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/app_lifecycle_manager.dart';
-import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/providers/all_transactions_provider.dart';
-import 'package:resonance_network_wallet/providers/filtered_all_transactions_provider.dart';
 import 'package:resonance_network_wallet/providers/pending_cancellations_provider.dart';
 import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/providers/connectivity_provider.dart';
+import 'package:resonance_network_wallet/shared/utils/tx_filter_family_provider.dart';
 
 /// Service that monitors reversible transfers approaching execution time
 /// and polls the chain aggressively when timers hit zero to catch state
@@ -156,17 +155,17 @@ class ReversibleTransferMonitoringService {
         // active-account views reflect the change immediately
         final affectedAccounts = <String>{transfer.from, transfer.to};
         for (final accountId in affectedAccounts) {
-          _ref
-              .read(filteredPaginationControllerProviderFamily(AccountIdListCache.get([accountId])).notifier)
-              .updateReversibleTransferToExecuted(transfer.txId, transaction.status);
+          updatePaginationFiltersFor(_ref.read, [accountId], (notifier, _) {
+            notifier.updateReversibleTransferToExecuted(transfer.txId, transaction.status);
+          });
         }
 
         // Also update filtered controllers for all accounts so
         // tx screen views for all accounts reflect the change immediately
         final accountIds = _ref.read(accountsProvider).value?.map((a) => a.accountId).toList() ?? [];
-        _ref
-            .read(filteredPaginationControllerProviderFamily(AccountIdListCache.get(accountIds)).notifier)
-            .updateReversibleTransferToExecuted(transfer.txId, transaction.status);
+        updatePaginationFiltersFor(_ref.read, accountIds, (notifier, _) {
+          notifier.updateReversibleTransferToExecuted(transfer.txId, transaction.status);
+        });
 
         // Refresh balance since transfer execution changes balance
         _ref.invalidate(balanceProviderFamily);
@@ -198,11 +197,9 @@ class ReversibleTransferMonitoringService {
       await _ref.read(paginationControllerProvider.notifier).silentRefresh();
       final active = _ref.read(activeAccountProvider).value;
       if (active != null) {
-        await _ref
-            .read(
-              filteredPaginationControllerProviderFamily(AccountIdListCache.get([active.account.accountId])).notifier,
-            )
-            .silentRefresh();
+        updatePaginationFiltersFor(_ref.read, [active.account.accountId], (notifier, _) {
+          notifier.silentRefresh();
+        });
       }
     }
   }
diff --git a/mobile-app/lib/services/wallet_creation_service.dart b/mobile-app/lib/services/wallet_creation_service.dart
new file mode 100644
index 000000000..1d9b0321f
--- /dev/null
+++ b/mobile-app/lib/services/wallet_creation_service.dart
@@ -0,0 +1,43 @@
+import 'dart:async';
+
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/services/referral_service.dart';
+
+class WalletCreationService {
+  final SettingsService _settings;
+  final AccountsService _accounts;
+  final ReferralService _referral;
+
+  WalletCreationService({
+    SettingsService? settingsService,
+    AccountsService? accountsService,
+    ReferralService? referralService,
+  }) : _settings = settingsService ?? SettingsService(),
+       _accounts = accountsService ?? AccountsService(),
+       _referral = referralService ?? ReferralService();
+
+  /// Saves [mnemonic] for [walletIndex], adds the root account when missing,
+  /// and runs referral registration for brand-new roots.
+  ///
+  /// Returns the root [Account] row to use after persistence (newly created or
+  /// already present).
+  Future<Account> createNewWallet({
+    required String name,
+    required String mnemonic,
+    required int walletIndex,
+    required String accountId,
+    required List<Account> existingAccounts,
+  }) async {
+    await _settings.setMnemonic(mnemonic, walletIndex);
+
+    final hasRoot = existingAccounts.any((a) => a.walletIndex == walletIndex && a.index == 0);
+    if (!hasRoot) {
+      final account = Account(walletIndex: walletIndex, index: 0, name: name, accountId: accountId);
+      await _accounts.addAccount(account);
+      unawaited(_referral.submitAddressToBackend());
+      return account;
+    }
+
+    return existingAccounts.firstWhere((a) => a.walletIndex == walletIndex && a.index == 0);
+  }
+}
diff --git a/mobile-app/lib/shared/utils/account_utils.dart b/mobile-app/lib/shared/utils/account_utils.dart
index 885aec18c..6c78a813f 100644
--- a/mobile-app/lib/shared/utils/account_utils.dart
+++ b/mobile-app/lib/shared/utils/account_utils.dart
@@ -9,3 +9,27 @@ List<int> getNonHardwareWalletIndices(List<Account> accounts) {
   }
   return nonHardwareWalletIndices.toList()..sort();
 }
+
+/// Smallest non-negative index not used as [Account.walletIndex] by any non-hardware account.
+/// Use when importing a new recovery phrase or otherwise adding a distinct software HD wallet.
+int nextNonHardwareWalletIndex(List<Account> accounts) {
+  final used = getNonHardwareWalletIndices(accounts).toSet();
+  var i = 0;
+  while (used.contains(i)) {
+    i++;
+  }
+  return i;
+}
+
+String getAccountBadgeInitials(String text, {required String separator}) {
+  if (text.isEmpty) return '?';
+
+  final parts = text.split(separator).map((s) => s.trim()).where((s) => s.isNotEmpty).toList();
+  if (parts.length >= 2) {
+    final a = parts[0];
+    final b = parts[1];
+    return '${a[0]}${b[0]}'.toUpperCase();
+  }
+
+  return text.length >= 2 ? text.substring(0, 2).toUpperCase() : text[0].toUpperCase();
+}
diff --git a/mobile-app/lib/shared/utils/debouncer.dart b/mobile-app/lib/shared/utils/debouncer.dart
new file mode 100644
index 000000000..2f29f3e5a
--- /dev/null
+++ b/mobile-app/lib/shared/utils/debouncer.dart
@@ -0,0 +1,47 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+
+/// Delays execution of [run] until [delay] has elapsed with no new calls.
+///
+/// Typical usage — debounce a network call triggered by text input:
+/// ```dart
+/// final _debouncer = Debouncer(delay: const Duration(milliseconds: 500));
+///
+/// void _onChanged(String value) {
+///   _debouncer.run(() => _fetchSomething(value));
+/// }
+///
+/// @override
+/// void dispose() {
+///   _debouncer.cancel();
+///   super.dispose();
+/// }
+/// ```
+class Debouncer {
+  final Duration delay;
+
+  Timer? _timer;
+
+  Debouncer({required this.delay});
+
+  /// Schedules [action] to run after [delay].
+  ///
+  /// If called again before the timer fires, the previous call is discarded
+  /// and the timer resets.
+  void run(VoidCallback action) {
+    _timer?.cancel();
+    _timer = Timer(delay, action);
+  }
+
+  /// Cancels any pending action without executing it.
+  ///
+  /// Call this in [State.dispose] to avoid callbacks firing on unmounted widgets.
+  void cancel() {
+    _timer?.cancel();
+    _timer = null;
+  }
+
+  /// Whether a call is currently pending.
+  bool get isPending => _timer?.isActive ?? false;
+}
diff --git a/mobile-app/lib/shared/utils/tx_filter_family_provider.dart b/mobile-app/lib/shared/utils/tx_filter_family_provider.dart
new file mode 100644
index 000000000..00a18a0df
--- /dev/null
+++ b/mobile-app/lib/shared/utils/tx_filter_family_provider.dart
@@ -0,0 +1,26 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/models/filtered_transactions_params.dart';
+import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
+import 'package:resonance_network_wallet/providers/controllers/unified_pagination_controller.dart';
+import 'package:resonance_network_wallet/providers/filtered_all_transactions_provider.dart';
+
+typedef Reader = T Function<T>(ProviderListenable<T> provider);
+
+void updatePaginationFiltersFor(
+  Reader read,
+  List<String> targetIds,
+  void Function(UnifiedPaginationController notifier, TransactionFilter filter) action,
+) {
+  final cachedIds = AccountIdListCache.get(targetIds);
+
+  for (final filter in TransactionFilter.values) {
+    final notifier = read(
+      filteredPaginationControllerProviderFamily(
+        FilteredTransactionsParams(accountIds: cachedIds, filter: filter),
+      ).notifier,
+    );
+
+    action(notifier, filter);
+  }
+}
diff --git a/mobile-app/lib/v2/components/account_badge.dart b/mobile-app/lib/v2/components/account_badge.dart
new file mode 100644
index 000000000..22324c481
--- /dev/null
+++ b/mobile-app/lib/v2/components/account_badge.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/shared/utils/account_utils.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class AccountBadge extends StatelessWidget {
+  final Account account;
+  final bool isActive;
+  final double size;
+  final TextStyle? textStyle;
+
+  const AccountBadge({super.key, required this.account, this.isActive = false, this.size = 40, this.textStyle});
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final label = getAccountBadgeInitials(account.name, separator: ' ');
+    final effectiveTextStyle = textStyle ?? context.themeText.transactionDetailRowValue?.copyWith(letterSpacing: -0.25);
+
+    return Container(
+      width: size,
+      height: size,
+      alignment: Alignment.center,
+      decoration: BoxDecoration(color: colors.sheetBackground, borderRadius: BorderRadius.circular(size / 2)),
+      child: Text(label, style: effectiveTextStyle?.copyWith(color: isActive ? colors.accentOrange : colors.textLabel)),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/address_checkphrase_with_initial.dart b/mobile-app/lib/v2/components/address_checkphrase_with_initial.dart
new file mode 100644
index 000000000..487f6df11
--- /dev/null
+++ b/mobile-app/lib/v2/components/address_checkphrase_with_initial.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/widgets.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/shared/utils/account_utils.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class AddressCheckphraseWithInitial extends StatelessWidget {
+  final String recipientChecksum;
+  final String recipientAddress;
+
+  const AddressCheckphraseWithInitial({super.key, required this.recipientChecksum, required this.recipientAddress});
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+
+    final avatarSize = 40.0;
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Container(
+          width: avatarSize,
+          height: avatarSize,
+          alignment: Alignment.center,
+          decoration: BoxDecoration(color: colors.sheetBackground, borderRadius: BorderRadius.circular(20)),
+          child: Text(
+            getAccountBadgeInitials(recipientChecksum, separator: '-'),
+            style: text.transactionDetailRowValue?.copyWith(color: colors.textLabel),
+          ),
+        ),
+        const SizedBox(width: 14),
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                recipientChecksum,
+                style: text.smallParagraph?.copyWith(color: colors.checksum, height: 1.35),
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+              ),
+              const SizedBox(height: 4),
+              Text(
+                AddressFormattingService.formatAddress(recipientAddress.trim()),
+                style: text.transactionDetailRowValue?.copyWith(fontSize: 14),
+              ),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/address_details_card.dart b/mobile-app/lib/v2/components/address_details_card.dart
new file mode 100644
index 000000000..06769d9be
--- /dev/null
+++ b/mobile-app/lib/v2/components/address_details_card.dart
@@ -0,0 +1,145 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
+import 'package:resonance_network_wallet/v2/components/split_card.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class AddressDetailsCard extends StatefulWidget {
+  final String accountId;
+  final String? checksum;
+
+  const AddressDetailsCard({super.key, required this.accountId, this.checksum});
+
+  @override
+  State<AddressDetailsCard> createState() => _AddressDetailsCardState();
+}
+
+class _AddressDetailsCardState extends State<AddressDetailsCard> {
+  bool _addressCopied = false;
+  bool _checksumCopied = false;
+  Timer? _resetTimer;
+
+  void _copyAddress(BuildContext context) {
+    context.copyTextWithToaster(widget.accountId);
+    _triggerCopied(isAddress: true);
+  }
+
+  void _copyChecksum(BuildContext context) {
+    if (widget.checksum == null) return;
+
+    context.copyTextWithToaster(widget.checksum!, message: 'Checkphrase copied');
+    _triggerCopied(isAddress: false);
+  }
+
+  void _triggerCopied({required bool isAddress}) {
+    _resetTimer?.cancel();
+
+    setState(() {
+      if (isAddress) {
+        _addressCopied = true;
+        _checksumCopied = false;
+      } else {
+        _checksumCopied = true;
+        _addressCopied = false;
+      }
+    });
+
+    _resetTimer = Timer(const Duration(seconds: 2), () {
+      if (mounted) {
+        setState(() {
+          if (isAddress) {
+            _addressCopied = false;
+          } else {
+            _checksumCopied = false;
+          }
+        });
+      }
+    });
+  }
+
+  @override
+  void dispose() {
+    _resetTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SplitCard(
+      topChild: InkWell(
+        onTap: () => _copyAddress(context),
+        child: _buildItem(context, 'ADDRESS', widget.accountId, isCopied: _addressCopied),
+      ),
+      bottomChild: InkWell(
+        onTap: () => _copyChecksum(context),
+        child: _buildItem(
+          context,
+          'CHECKPHRASE',
+          widget.checksum ?? 'Loading...',
+          isCheckphrase: true,
+          isCopied: _checksumCopied,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildItem(
+    BuildContext context,
+    String label,
+    String value, {
+    bool isCheckphrase = false,
+    required bool isCopied,
+  }) {
+    final valueTextStyle = isCheckphrase
+        ? context.themeText.smallParagraph?.copyWith(color: context.colors.checksum)
+        : context.themeText.smallParagraph?.copyWith(fontFamily: AppTextTheme.fontFamilySecondary);
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(label, style: context.themeText.receiveLabel?.copyWith(color: context.colors.textLabel)),
+              const SizedBox(height: 16),
+              Text(value, style: valueTextStyle),
+            ],
+          ),
+        ),
+
+        const SizedBox(width: 32),
+
+        _copyButton(isCopied: isCopied),
+      ],
+    );
+  }
+
+  Widget _copyButton({required bool isCopied}) {
+    final containerSize = 40.0;
+    final iconSize = 16.0;
+
+    return AnimatedContainer(
+      duration: const Duration(milliseconds: 200),
+      width: containerSize,
+      height: containerSize,
+      decoration: BoxDecoration(
+        color: isCopied ? context.colors.copyButtonCopiedBg : Colors.transparent,
+        border: Border.all(
+          color: isCopied ? context.colors.copyButtonCopiedBorder : context.colors.borderButton,
+          width: 1,
+        ),
+        borderRadius: BorderRadius.circular(containerSize / 2),
+      ),
+      child: Center(
+        child: Icon(
+          isCopied ? Icons.check : Icons.copy,
+          size: iconSize,
+          color: isCopied ? context.colors.success : context.colors.textPrimary,
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/amount_display_with_conversion.dart b/mobile-app/lib/v2/components/amount_display_with_conversion.dart
new file mode 100644
index 000000000..03405fe0d
--- /dev/null
+++ b/mobile-app/lib/v2/components/amount_display_with_conversion.dart
@@ -0,0 +1,112 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/providers/currency_display_provider.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_icon_button.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class AmountDisplayWithConversion extends StatelessWidget {
+  final CurrencyDisplayState amountDisplay;
+  final VoidCallback? onFlip;
+  final CrossAxisAlignment alignment;
+  final bool colorizeAmount;
+  final bool useQuanLogo;
+
+  const AmountDisplayWithConversion({
+    super.key,
+    required this.amountDisplay,
+    this.onFlip,
+    this.alignment = CrossAxisAlignment.center,
+    this.colorizeAmount = false,
+    this.useQuanLogo = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final text = context.themeText;
+    final colors = context.colors;
+
+    final primaryAmountColor = colorizeAmount ? colors.success : colors.textPrimary;
+    final quanLogoPrimarySize = 32.0;
+
+    final secondaryAmountColor = colors.textTertiary;
+    final secondaryAmountBaseStyle = text.paragraph?.copyWith(
+      color: secondaryAmountColor,
+      fontFamily: AppTextTheme.fontFamilySecondary,
+    );
+    final quanLogoSecondarySize = 12.0;
+
+    final MainAxisAlignment mainAxisAlignment = switch (alignment) {
+      CrossAxisAlignment.center => MainAxisAlignment.center,
+      _ => MainAxisAlignment.start,
+    };
+
+    return Column(
+      crossAxisAlignment: alignment,
+      children: [
+        Row(
+          mainAxisAlignment: mainAxisAlignment,
+          children: [
+            if (useQuanLogo && !amountDisplay.isFlipped) ...[
+              SvgPicture.asset(
+                'assets/v2/uppercase_q.svg',
+                width: quanLogoPrimarySize,
+                height: quanLogoPrimarySize,
+                colorFilter: ColorFilter.mode(context.colors.textPrimary, BlendMode.srcIn),
+              ),
+              const SizedBox(width: 4),
+            ],
+            Text.rich(
+              TextSpan(
+                children: [
+                  TextSpan(
+                    text: amountDisplay.primaryAmount,
+                    style: text.conversionAmountPrimary?.copyWith(color: primaryAmountColor),
+                  ),
+                  if (!useQuanLogo && !amountDisplay.isFlipped) ...[
+                    const TextSpan(text: '     '),
+                    TextSpan(
+                      text: AppConstants.tokenSymbol,
+                      style: text.mediumTitle?.copyWith(
+                        fontFamily: AppTextTheme.fontFamilySecondary,
+                        color: primaryAmountColor,
+                      ),
+                    ),
+                  ],
+                ],
+              ),
+            ),
+          ],
+        ),
+        const SizedBox(height: 6),
+        Row(
+          mainAxisAlignment: mainAxisAlignment,
+          children: [
+            if (useQuanLogo && amountDisplay.isFlipped) ...[
+              Text('≈ ', style: secondaryAmountBaseStyle),
+              SvgPicture.asset(
+                'assets/v2/uppercase_q.svg',
+                width: quanLogoSecondarySize,
+                height: quanLogoSecondarySize,
+                colorFilter: ColorFilter.mode(secondaryAmountColor, BlendMode.srcIn),
+              ),
+              const SizedBox(width: 2),
+              Text(amountDisplay.secondaryAmount, style: secondaryAmountBaseStyle),
+            ] else
+              Text('≈ ${amountDisplay.secondaryAmount}', style: secondaryAmountBaseStyle),
+            if (onFlip != null) ...[
+              const SizedBox(width: 8),
+              QuantusIconButton.circular(
+                icon: Icons.swap_vert,
+                onTap: onFlip,
+                isActive: amountDisplay.isFlipped,
+                size: IconButtonSize.small,
+              ),
+            ],
+          ],
+        ),
+      ],
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/android_glass.dart b/mobile-app/lib/v2/components/android_glass.dart
deleted file mode 100644
index 5ab3ad1b6..000000000
--- a/mobile-app/lib/v2/components/android_glass.dart
+++ /dev/null
@@ -1,130 +0,0 @@
-import 'dart:math' as math;
-import 'dart:ui' as ui;
-import 'package:flutter/material.dart';
-
-class AndroidGlass extends StatelessWidget {
-  final double visibility;
-  final Color glassColor;
-  final double radius;
-  final double lightIntensity;
-  final double lightAngle;
-  final double thickness;
-  final double ambientStrength;
-  final bool centered;
-  final Widget child;
-
-  const AndroidGlass({
-    super.key,
-    required this.child,
-    this.visibility = 1.0,
-    this.glassColor = const Color(0x1AFFFFFF),
-    this.radius = 14.0,
-    this.lightIntensity = 0.5,
-    this.lightAngle = 45 * (3.1416 / 180),
-    this.thickness = 20.0,
-    this.ambientStrength = 0.0,
-    this.centered = true,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    Widget glass = ClipRRect(
-      borderRadius: BorderRadius.circular(radius),
-      child: CustomPaint(
-        foregroundPainter: _SpecularPainter(
-          radius: radius,
-          lightIntensity: lightIntensity * visibility,
-          lightAngle: lightAngle,
-          thickness: thickness * visibility,
-          ambientStrength: ambientStrength,
-        ),
-        child: DecoratedBox(
-          decoration: BoxDecoration(color: glassColor),
-          child: child,
-        ),
-      ),
-    );
-
-    if (visibility < 1.0) glass = Opacity(opacity: visibility, child: glass);
-    return centered ? Center(child: glass) : glass;
-  }
-}
-
-class _SpecularPainter extends CustomPainter {
-  final double radius;
-  final double lightIntensity;
-  final double lightAngle;
-  final double thickness;
-  final double ambientStrength;
-
-  const _SpecularPainter({
-    required this.radius,
-    required this.lightIntensity,
-    required this.lightAngle,
-    required this.thickness,
-    required this.ambientStrength,
-  });
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    final path = Path()..addRRect(RRect.fromRectAndRadius(Offset.zero & size, Radius.circular(radius)));
-    final bounds = Offset.zero & size;
-    final squareBounds = Rect.fromCircle(center: bounds.center, radius: bounds.size.longestSide / 2);
-
-    final intensity = lightIntensity.clamp(0.0, 1.0);
-    final thicknessFactor = (thickness / 5).clamp(0.0, 1.0);
-    final alpha = Curves.easeOut.transform(intensity);
-    final color = Colors.white.withValues(alpha: alpha * thicknessFactor);
-
-    final x = math.cos(lightAngle);
-    final y = math.sin(lightAngle);
-
-    final lightCoverage = ui.lerpDouble(.3, .5, intensity)!;
-    final alignmentWithShortestSide = (size.aspectRatio < 1 ? y : x).abs();
-    final aspectAdjustment = 1 - 1 / size.aspectRatio;
-    final gradientScale = aspectAdjustment * (1 - alignmentWithShortestSide);
-    final inset = ui.lerpDouble(0, .5, gradientScale.clamp(0, 1))!;
-    final secondInset = ui.lerpDouble(lightCoverage, .5, gradientScale.clamp(0, 1))!;
-
-    final shader = LinearGradient(
-      colors: [
-        color,
-        color.withValues(alpha: ambientStrength),
-        color.withValues(alpha: ambientStrength),
-        color,
-      ],
-      stops: [inset, secondInset, 1 - secondInset, 1 - inset],
-      begin: Alignment(x, y),
-      end: Alignment(-x, -y),
-    ).createShader(squareBounds);
-
-    canvas.drawPath(
-      path,
-      Paint()
-        ..shader = shader
-        ..style = PaintingStyle.stroke
-        ..strokeWidth = ui.lerpDouble(1, 2, intensity)!
-        ..color = color.withValues(alpha: color.a * 0.3)
-        ..blendMode = BlendMode.hardLight,
-    );
-
-    canvas.drawPath(
-      path,
-      Paint()
-        ..shader = shader
-        ..style = PaintingStyle.stroke
-        ..maskFilter = MaskFilter.blur(BlurStyle.normal, thickness / 40)
-        ..strokeWidth = thickness / 10
-        ..color = color.withValues(alpha: color.a * 0.6)
-        ..blendMode = BlendMode.overlay,
-    );
-  }
-
-  @override
-  bool shouldRepaint(_SpecularPainter old) =>
-      radius != old.radius ||
-      lightIntensity != old.lightIntensity ||
-      lightAngle != old.lightAngle ||
-      thickness != old.thickness ||
-      ambientStrength != old.ambientStrength;
-}
diff --git a/mobile-app/lib/v2/components/back_button.dart b/mobile-app/lib/v2/components/back_button.dart
index 09cafb2ae..5de337377 100644
--- a/mobile-app/lib/v2/components/back_button.dart
+++ b/mobile-app/lib/v2/components/back_button.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:resonance_network_wallet/v2/components/glass_button_base.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 
 class AppBackButton extends StatelessWidget {
@@ -9,13 +10,22 @@ class AppBackButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final double containerSize = 28;
+    final double iconSize = 24;
+
     return GestureDetector(
       onTap: onTap ?? () => Navigator.pop(context),
-      child: SvgPicture.asset(
-        'assets/v2/caret_left.svg',
-        width: 24,
-        height: 24,
-        colorFilter: ColorFilter.mode(context.colors.textPrimary, BlendMode.srcIn),
+      child: GlassButtonBase(
+        buttonHeight: containerSize,
+        buttonWidth: containerSize,
+        borderRadius: BorderRadius.circular(containerSize / 2),
+        padding: const EdgeInsets.all(2),
+        child: SvgPicture.asset(
+          'assets/v2/caret_left.svg',
+          width: iconSize,
+          height: iconSize,
+          colorFilter: ColorFilter.mode(context.colors.textPrimary, BlendMode.srcIn),
+        ),
       ),
     );
   }
diff --git a/mobile-app/lib/v2/components/base_background.dart b/mobile-app/lib/v2/components/base_background.dart
new file mode 100644
index 000000000..80bea0eaf
--- /dev/null
+++ b/mobile-app/lib/v2/components/base_background.dart
@@ -0,0 +1,13 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+
+class BaseBackground extends StatelessWidget {
+  final Widget child;
+
+  const BaseBackground({super.key, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(color: context.colors.background, child: child);
+  }
+}
diff --git a/mobile-app/lib/v2/components/bottom_sheet_container.dart b/mobile-app/lib/v2/components/bottom_sheet_container.dart
index be1ca5dfe..46e4697ed 100644
--- a/mobile-app/lib/v2/components/bottom_sheet_container.dart
+++ b/mobile-app/lib/v2/components/bottom_sheet_container.dart
@@ -9,6 +9,7 @@ class BottomSheetContainer extends StatelessWidget {
   final Widget child;
   final VoidCallback? onBack;
   final double? height;
+  final bool showDragHandle;
 
   const BottomSheetContainer({
     super.key,
@@ -17,24 +18,36 @@ class BottomSheetContainer extends StatelessWidget {
     this.titleBuilder,
     this.onBack,
     this.height,
+    this.showDragHandle = true,
   });
 
   @override
   Widget build(BuildContext context) {
     final colors = context.colors;
     final text = context.themeText;
+    final topPadding = showDragHandle ? 12.0 : 40.0;
     return Container(
       height: height,
-      padding: const EdgeInsets.fromLTRB(24, 40, 24, 40),
+      padding: EdgeInsets.fromLTRB(24, topPadding, 24, 24),
       decoration: BoxDecoration(
-        color: const Color(0xFF1A1A1A),
-        border: Border.all(color: const Color(0xFF3D3D3D)),
-        borderRadius: BorderRadius.circular(24),
+        color: colors.background,
+        border: Border.all(color: colors.borderButton, width: 1),
+        borderRadius: BorderRadius.circular(32),
       ),
       child: Column(
         mainAxisSize: height != null ? MainAxisSize.max : MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
+          if (showDragHandle) ...[
+            Center(
+              child: Container(
+                width: 56,
+                height: 4,
+                decoration: BoxDecoration(color: colors.borderButton, borderRadius: BorderRadius.circular(23)),
+              ),
+            ),
+            const SizedBox(height: 20),
+          ],
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
@@ -49,7 +62,11 @@ class BottomSheetContainer extends StatelessWidget {
               else
                 Text(
                   title,
-                  style: text.smallTitle?.copyWith(color: colors.textPrimary, fontSize: 20),
+                  style: text.smallTitle?.copyWith(
+                    color: colors.textPrimary,
+                    fontSize: 20,
+                    fontWeight: FontWeight.w500,
+                  ),
                   textAlign: TextAlign.center,
                 ),
 
@@ -59,7 +76,7 @@ class BottomSheetContainer extends StatelessWidget {
               ),
             ],
           ),
-          const SizedBox(height: 32),
+          SizedBox(height: showDragHandle ? 28 : 32),
           if (height != null) Expanded(child: child) else Flexible(child: SingleChildScrollView(child: child)),
         ],
       ),
diff --git a/mobile-app/lib/v2/components/glass_button_base.dart b/mobile-app/lib/v2/components/glass_button_base.dart
new file mode 100644
index 000000000..6306026a6
--- /dev/null
+++ b/mobile-app/lib/v2/components/glass_button_base.dart
@@ -0,0 +1,58 @@
+import 'dart:math' as math;
+import 'package:flutter/material.dart';
+
+class GlassButtonBase extends StatelessWidget {
+  final Widget child;
+  final double? buttonHeight;
+  final double? buttonWidth;
+  final BorderRadius? borderRadius;
+  final EdgeInsets? padding;
+
+  const GlassButtonBase({
+    super.key,
+    required this.child,
+    this.buttonHeight,
+    this.buttonWidth,
+    this.borderRadius,
+    this.padding,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: buttonHeight,
+      width: buttonWidth,
+      decoration: BoxDecoration(
+        borderRadius: borderRadius,
+        gradient: const LinearGradient(
+          transform: GradientRotation(30 * math.pi / 180),
+          colors: [
+            Color(0xFF6F6F6F), // 0%
+            Color(0xFF1F1F1F), // 25%
+            Color(0xFF0E0E0E), // 50%
+            Color(0xFF1F1F1F), // 75%
+            Color(0xFF6F6F6F), // 100%
+          ],
+          stops: [0.0, 0.25, 0.50, 0.75, 1.0],
+        ),
+      ),
+      // The padding acts as the border thickness!
+      padding: const EdgeInsets.all(0.5),
+      child: Container(
+        decoration: BoxDecoration(
+          borderRadius: borderRadius,
+          gradient: const LinearGradient(
+            transform: GradientRotation(45 * math.pi / 180),
+            colors: [Color(0xFF050505), Color(0xFF171717)],
+            stops: [0, 1],
+          ),
+        ),
+        child: Container(
+          padding: padding,
+          decoration: BoxDecoration(borderRadius: borderRadius, color: const Color.fromRGBO(255, 255, 255, 0.02)),
+          child: child,
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/glass_circle_icon_button.dart b/mobile-app/lib/v2/components/glass_circle_icon_button.dart
deleted file mode 100644
index a91d4af77..000000000
--- a/mobile-app/lib/v2/components/glass_circle_icon_button.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'package:flutter/material.dart';
-
-class GlassCircleIconButton extends StatelessWidget {
-  static const _bgAsset = 'assets/v2/glass_circle_icon_button_bg.png';
-
-  final IconData icon;
-  final VoidCallback? onTap;
-  final double size;
-  final double iconSize;
-  final Color iconColor;
-  final bool filled;
-
-  const GlassCircleIconButton({
-    super.key,
-    required this.icon,
-    required this.iconColor,
-    this.onTap,
-    this.size = 48,
-    this.iconSize = 20,
-    this.filled = true,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onTap,
-      child: SizedBox(
-        width: size,
-        height: size,
-        child: Stack(
-          fit: StackFit.expand,
-          children: [
-            Opacity(
-              opacity: filled ? 1 : 0.92,
-              child: Image.asset(_bgAsset, fit: BoxFit.cover),
-            ),
-            Center(
-              child: Icon(icon, color: iconColor, size: iconSize),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/mobile-app/lib/v2/components/glass_icon_button.dart b/mobile-app/lib/v2/components/glass_icon_button.dart
deleted file mode 100644
index 2e479ebcc..000000000
--- a/mobile-app/lib/v2/components/glass_icon_button.dart
+++ /dev/null
@@ -1,85 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:resonance_network_wallet/v2/components/liquid_glass_base.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-
-enum IconButtonShape { rounded, circular }
-
-enum IconButtonSize { small, medium }
-
-class GlassIconButton extends StatelessWidget {
-  final IconData icon;
-  final VoidCallback? onTap;
-  final bool isLoading;
-  final IconButtonSize size;
-  final IconButtonShape shape;
-  final bool isDisabled;
-  final double? radius;
-
-  const GlassIconButton.rounded({
-    super.key,
-    required this.icon,
-    this.size = IconButtonSize.medium,
-    this.onTap,
-    this.isLoading = false,
-    this.isDisabled = false,
-    this.radius,
-  }) : shape = IconButtonShape.rounded;
-
-  const GlassIconButton.circular({
-    super.key,
-    required this.icon,
-    this.size = IconButtonSize.medium,
-    this.onTap,
-    this.isLoading = false,
-    this.isDisabled = false,
-    this.radius,
-  }) : shape = IconButtonShape.circular;
-
-  @override
-  Widget build(BuildContext context) {
-    final bool disabled = onTap == null || isLoading || isDisabled;
-    final visibility = disabled ? 0.92 : 1.0;
-    final glassColor = context.colors.surfaceGlass;
-
-    final double buttonSize = size == IconButtonSize.small ? 24 : 40;
-    final double iconSize = size == IconButtonSize.small ? 12 : 20;
-    final double radius = this.radius ?? (size == IconButtonSize.small ? 6 : 14);
-
-    final buttonContent = Center(
-      child: isLoading
-          ? SizedBox(
-              width: buttonSize + 6,
-              height: buttonSize + 6,
-              child: CircularProgressIndicator(color: context.colors.textPrimary, strokeWidth: 2.0),
-            )
-          : SizedBox(
-              width: buttonSize,
-              height: buttonSize,
-              child: Icon(icon, color: context.colors.textPrimary, size: iconSize),
-            ),
-    );
-
-    Widget buttonWidget;
-
-    switch (shape) {
-      case IconButtonShape.rounded:
-        buttonWidget = LiquidGlassBase.rounded(
-          visibility: visibility,
-          glassColor: glassColor,
-          radius: radius,
-          child: SizedBox(width: buttonSize, height: buttonSize, child: buttonContent),
-        );
-        break;
-
-      case IconButtonShape.circular:
-        buttonWidget = LiquidGlassBase.circular(
-          visibility: visibility,
-          glassColor: glassColor,
-          child: SizedBox(width: buttonSize, height: buttonSize, child: buttonContent),
-        );
-        break;
-    }
-
-    return InkWell(onTap: disabled ? null : onTap, child: buttonWidget);
-  }
-}
diff --git a/mobile-app/lib/v2/components/gradient_background.dart b/mobile-app/lib/v2/components/gradient_background.dart
deleted file mode 100644
index e4f0520d8..000000000
--- a/mobile-app/lib/v2/components/gradient_background.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'package:flutter/material.dart';
-
-class GradientBackground extends StatelessWidget {
-  final Widget child;
-
-  const GradientBackground({super.key, required this.child});
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        Positioned.fill(child: Image.asset('assets/v2/gradient_background.png', fit: BoxFit.cover)),
-        child,
-      ],
-    );
-  }
-}
diff --git a/mobile-app/lib/v2/components/inset_button_container.dart b/mobile-app/lib/v2/components/inset_button_container.dart
deleted file mode 100644
index c255f5364..000000000
--- a/mobile-app/lib/v2/components/inset_button_container.dart
+++ /dev/null
@@ -1,51 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_inset_shadow/flutter_inset_shadow.dart' as inset;
-import 'package:quantus_sdk/quantus_sdk.dart';
-
-class InsetButtonContainer extends StatelessWidget {
-  final Widget child;
-
-  final EdgeInsetsGeometry? padding;
-  final double? width;
-  final Color? backgroundColor;
-  final BoxBorder? border;
-
-  const InsetButtonContainer({
-    super.key,
-    required this.child,
-    this.width,
-    this.padding,
-    this.backgroundColor,
-    this.border,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      width: width,
-      padding: padding,
-      decoration: inset.BoxDecoration(
-        borderRadius: BorderRadius.circular(14.0),
-        color: backgroundColor,
-        boxShadow: [
-          inset.BoxShadow(
-            color: Colors.black.useOpacity(0.3),
-            blurRadius: 56,
-            spreadRadius: -38,
-            offset: const Offset(12, 12),
-            inset: true,
-          ),
-          inset.BoxShadow(
-            color: Colors.white.useOpacity(0.3),
-            blurRadius: 56,
-            spreadRadius: -38,
-            offset: const Offset(-12, -12),
-            inset: true,
-          ),
-        ],
-        border: border,
-      ),
-      child: child,
-    );
-  }
-}
diff --git a/mobile-app/lib/v2/components/liquid_glass_base.dart b/mobile-app/lib/v2/components/liquid_glass_base.dart
deleted file mode 100644
index 5f35e4476..000000000
--- a/mobile-app/lib/v2/components/liquid_glass_base.dart
+++ /dev/null
@@ -1,69 +0,0 @@
-import 'dart:io' show Platform;
-import 'package:flutter/material.dart';
-import 'package:liquid_glass_renderer/liquid_glass_renderer.dart';
-import 'package:resonance_network_wallet/v2/components/android_glass.dart';
-
-enum Shape { rounded, circular }
-
-class LiquidGlassBase extends StatelessWidget {
-  final double visibility;
-  final Color glassColor;
-  final Shape shape;
-  final double radius;
-
-  final bool centered;
-  final Widget child;
-
-  const LiquidGlassBase.rounded({
-    super.key,
-    this.visibility = 1.0,
-    this.glassColor = Colors.transparent,
-    this.radius = 14.0,
-    this.centered = true,
-    required this.child,
-  }) : shape = Shape.rounded;
-
-  const LiquidGlassBase.circular({
-    super.key,
-    this.visibility = 1.0,
-    this.glassColor = Colors.transparent,
-    this.centered = true,
-    required this.child,
-  }) : shape = Shape.circular,
-       radius = 100.0;
-
-  LiquidGlassSettings get _settings => LiquidGlassSettings(
-    glassColor: glassColor,
-    visibility: visibility,
-    thickness: 20,
-    blur: 4,
-    refractiveIndex: 1.33,
-    lightAngle: 45 * (3.1416 / 180),
-    lightIntensity: 0.5,
-    ambientStrength: -0.2,
-    saturation: 1.5,
-  );
-
-  @override
-  Widget build(BuildContext context) {
-    final settings = _settings;
-    if (Platform.isAndroid) {
-      return AndroidGlass(
-        visibility: settings.visibility,
-        glassColor: settings.glassColor == Colors.transparent ? const Color(0x1AFFFFFF) : glassColor,
-        radius: radius,
-        centered: centered,
-        child: child,
-      );
-    } else {
-      var liquidGlass = LiquidGlass(
-        shape: LiquidRoundedSuperellipse(borderRadius: radius),
-        child: child,
-      );
-      return LiquidGlassLayer(
-        settings: settings,
-        child: centered ? Center(child: liquidGlass) : liquidGlass,
-      );
-    }
-  }
-}
diff --git a/mobile-app/lib/v2/components/loader.dart b/mobile-app/lib/v2/components/loader.dart
new file mode 100644
index 000000000..21880d126
--- /dev/null
+++ b/mobile-app/lib/v2/components/loader.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/shared/extensions/media_query_data_extension.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+
+class Loader extends StatelessWidget {
+  final Color? color;
+  final double? size;
+
+  const Loader({super.key, this.color, this.size});
+
+  @override
+  Widget build(BuildContext context) {
+    final effectiveSize = size ?? (context.isTablet ? 24 : 16);
+
+    return SizedBox(
+      height: effectiveSize,
+      width: effectiveSize,
+      child: CircularProgressIndicator(strokeWidth: 2, color: color ?? context.colors.textSecondary),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/name_field.dart b/mobile-app/lib/v2/components/name_field.dart
new file mode 100644
index 000000000..a63ec2a90
--- /dev/null
+++ b/mobile-app/lib/v2/components/name_field.dart
@@ -0,0 +1,86 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class NameField extends StatelessWidget {
+  final TextEditingController controller;
+  final String? subtitle;
+  final String? error;
+
+  const NameField({super.key, required this.controller, this.subtitle, this.error});
+
+  @override
+  Widget build(BuildContext context) {
+    final textStyle = context.themeText.smallTitle!.copyWith(fontWeight: FontWeight.w400);
+
+    return Column(
+      children: [
+        Container(
+          padding: const EdgeInsets.all(16),
+          decoration: BoxDecoration(color: context.colors.surfaceDeep, borderRadius: BorderRadius.circular(14)),
+          child: Row(
+            children: [
+              Expanded(
+                child: TextField(
+                  controller: controller,
+                  style: textStyle,
+                  decoration: InputDecoration.collapsed(
+                    hintText: 'Enter a name for your account',
+                    hintStyle: textStyle.copyWith(color: context.colors.textSecondary),
+                  ),
+                ),
+              ),
+              if (controller.text.isNotEmpty) ...[
+                const SizedBox(width: 8),
+                _EditAccountClearButton(onTap: () => controller.clear()),
+              ],
+            ],
+          ),
+        ),
+        if (subtitle != null) ...[
+          const SizedBox(height: 16),
+          Text(subtitle!, style: context.themeText.smallParagraph?.copyWith(color: context.colors.textSecondary)),
+        ],
+        if (error != null) ...[
+          const SizedBox(height: 16),
+          Text(
+            error!,
+            style: context.themeText.detail?.copyWith(color: context.colors.textError),
+            textAlign: TextAlign.center,
+          ),
+        ],
+      ],
+    );
+  }
+}
+
+class _EditAccountClearButton extends StatelessWidget {
+  final VoidCallback onTap;
+
+  const _EditAccountClearButton({required this.onTap});
+
+  @override
+  Widget build(BuildContext context) {
+    final size = 20.0;
+    final borderRadius = 16.0;
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(borderRadius),
+        child: Container(
+          width: size,
+          height: size,
+          alignment: Alignment.center,
+          decoration: BoxDecoration(
+            color: context.colors.textMuted,
+            border: Border.all(color: context.colors.borderButton, width: 0.5),
+            borderRadius: BorderRadius.circular(borderRadius),
+          ),
+          child: Icon(Icons.close, size: 12, color: context.colors.background),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/qr_scanner_page.dart b/mobile-app/lib/v2/components/qr_scanner_page.dart
index 516e525a0..4c8f228ce 100644
--- a/mobile-app/lib/v2/components/qr_scanner_page.dart
+++ b/mobile-app/lib/v2/components/qr_scanner_page.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/components/glass_icon_button.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_icon_button.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 
 class QrScannerPage extends StatefulWidget {
@@ -67,8 +67,6 @@ class _QrScannerPageState extends State<QrScannerPage> {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                _actionButton(icon: Icons.image_outlined, onTap: _pickImage, colors: colors),
-                const SizedBox(width: 8),
                 ValueListenableBuilder<MobileScannerState>(
                   valueListenable: _controller,
                   builder: (_, state, _) {
@@ -80,23 +78,19 @@ class _QrScannerPageState extends State<QrScannerPage> {
                     );
                   },
                 ),
+                const SizedBox(width: 8),
+                _actionButton(icon: Icons.image_outlined, onTap: _pickImage, colors: colors),
               ],
             ),
           ),
-
-          Positioned(
-            bottom: 58,
-            left: 24,
-            right: 24,
-            child: GlassButton.simple(label: 'Cancel', onTap: () => Navigator.pop(context)),
-          ),
+          const Positioned(top: 20, left: 24, right: 24, child: V2AppBar(title: 'Scan QR Code')),
         ],
       ),
     );
   }
 
   Widget _actionButton({required IconData icon, required VoidCallback onTap, required AppColorsV2 colors}) {
-    return GlassIconButton.rounded(icon: icon, onTap: onTap);
+    return QuantusIconButton.rounded(icon: icon, onTap: onTap, size: IconButtonSize.large);
   }
 }
 
@@ -131,7 +125,8 @@ class _ScanFrame extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final color = Colors.white.withValues(alpha: 0.92);
+    final color = context.colors.accentOrange;
+
     return SizedBox(
       width: size,
       height: size,
diff --git a/mobile-app/lib/v2/components/glass_button.dart b/mobile-app/lib/v2/components/quantus_button.dart
similarity index 53%
rename from mobile-app/lib/v2/components/glass_button.dart
rename to mobile-app/lib/v2/components/quantus_button.dart
index 167b4e9f4..e46c381b3 100644
--- a/mobile-app/lib/v2/components/glass_button.dart
+++ b/mobile-app/lib/v2/components/quantus_button.dart
@@ -1,14 +1,15 @@
+import 'dart:math' as math;
 import 'package:flutter/material.dart';
-import 'package:resonance_network_wallet/v2/components/inset_button_container.dart';
-import 'package:resonance_network_wallet/v2/components/liquid_glass_base.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
 
-enum ButtonVariant { transparent, primary, secondary, danger }
+enum ButtonVariant { transparent, primary, secondary, danger, success, outline }
 
 enum IconPlacement { leading, trailing, top }
 
-class GlassButton extends StatelessWidget {
+class QuantusButton extends StatelessWidget {
   final Widget? child;
   final String? _label;
   final Widget? _icon;
@@ -26,7 +27,7 @@ class GlassButton extends StatelessWidget {
   static const double defaultBorderRadius = 14.0;
   static const double buttonFontSize = 16.0;
 
-  const GlassButton({
+  const QuantusButton({
     super.key,
     required Widget this.child,
     this.onTap,
@@ -43,7 +44,7 @@ class GlassButton extends StatelessWidget {
        _textStyle = null;
 
   // this is a simple button with a label and an icon
-  const GlassButton.simple({
+  const QuantusButton.simple({
     super.key,
     required String label,
     Widget? icon,
@@ -66,79 +67,89 @@ class GlassButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final bool disabled = onTap == null || isLoading || isDisabled;
-    final visibility = disabled ? 0.25 : 1.0;
-    final buttonContent = _buildContent(context);
+    final visibility = disabled ? 0.5 : 1.0;
+    final buttonContent = _buildContent(context, variant: variant, disabled: disabled);
+    final borderRadius = BorderRadius.circular(this.borderRadius);
+    final basicBorder = BorderSide(color: context.colors.borderButton, width: 1);
 
-    Widget buttonWidget;
+    Color? buttonDecorationColor;
+    LinearGradient? buttonDecorationGradient;
+    BorderSide borderSide = BorderSide.none;
 
     switch (variant) {
       case ButtonVariant.primary:
-        buttonWidget = LiquidGlassBase.rounded(
-          glassColor: context.colors.surfaceGlass,
-          visibility: visibility,
-          radius: borderRadius,
-          centered: centered,
-          child: Padding(padding: padding, child: buttonContent),
-        );
+        buttonDecorationColor = context.colors.accentOrange;
         break;
 
       case ButtonVariant.secondary:
-        buttonWidget = LiquidGlassBase.rounded(
-          visibility: visibility,
-          radius: borderRadius,
-          centered: centered,
-          child: InsetButtonContainer(
-            width: width,
-            padding: padding,
-            border: BoxBorder.all(color: context.colors.borderSubtle, width: 0.8),
-            child: buttonContent,
-          ),
+        buttonDecorationGradient = LinearGradient(
+          transform: const GradientRotation(90 * math.pi / 180),
+          colors: [context.colors.surfaceDeep, context.colors.sheetBackground],
+          stops: [0.0, 1.0],
         );
+        borderSide = basicBorder.copyWith(color: context.colors.borderButton.useOpacity(0.5));
         break;
 
       case ButtonVariant.danger:
-        buttonWidget = LiquidGlassBase.rounded(
-          visibility: visibility,
-          radius: borderRadius,
-          centered: centered,
-          child: InsetButtonContainer(
-            width: width,
-            padding: padding,
-            backgroundColor: context.colors.buttonDanger,
-            border: BoxBorder.all(color: context.colors.borderDanger, width: 1.5),
-            child: buttonContent,
-          ),
-        );
+        buttonDecorationColor = context.colors.buttonDanger;
+        break;
+
+      case ButtonVariant.success:
+        buttonDecorationColor = context.colors.success;
         break;
 
       case ButtonVariant.transparent:
-        buttonWidget = Container(
-          width: width,
-          padding: padding,
-          decoration: ShapeDecoration(shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(borderRadius))),
-          child: Opacity(opacity: visibility, child: buttonContent),
-        );
+        buttonDecorationColor = Colors.transparent;
+        break;
+
+      case ButtonVariant.outline:
+        buttonDecorationColor = Colors.transparent;
+        borderSide = basicBorder;
         break;
     }
 
-    return InkWell(onTap: disabled ? null : onTap, child: buttonWidget);
+    return InkWell(
+      onTap: disabled ? null : onTap,
+      child: Opacity(
+        opacity: visibility,
+        child: Container(
+          width: width,
+          padding: padding,
+          decoration: ShapeDecoration(
+            color: disabled ? context.colors.sheetBackground : buttonDecorationColor,
+            gradient: disabled ? null : buttonDecorationGradient,
+            shape: RoundedRectangleBorder(borderRadius: borderRadius, side: disabled ? basicBorder : borderSide),
+          ),
+          child: buttonContent,
+        ),
+      ),
+    );
   }
 
-  Widget _buildContent(BuildContext context) {
+  Widget _buildContent(BuildContext context, {ButtonVariant variant = ButtonVariant.primary, bool disabled = false}) {
+    final textColor = switch (variant) {
+      ButtonVariant.primary => context.colors.background,
+      ButtonVariant.secondary => context.colors.textPrimary,
+      ButtonVariant.danger => context.colors.textPrimary,
+      ButtonVariant.transparent => context.colors.textPrimary,
+      ButtonVariant.success => context.colors.textPrimary,
+      ButtonVariant.outline => context.colors.textLabel,
+    };
+
     if (isLoading) {
       final size = (_textStyle?.fontSize ?? buttonFontSize) + 6;
-      return Center(
-        child: SizedBox(
-          width: size,
-          height: size,
-          child: CircularProgressIndicator(color: context.colors.textPrimary, strokeWidth: 2.0),
-        ),
-      );
+      return Center(child: Loader(size: size));
     }
 
     if (child != null) return child!;
 
-    final effectiveTextStyle = _textStyle ?? context.themeText.smallTitle!.copyWith(fontSize: buttonFontSize);
+    final effectiveTextStyle =
+        _textStyle ??
+        context.themeText.paragraph!.copyWith(
+          fontSize: buttonFontSize,
+          color: disabled ? context.colors.textPrimary.useOpacity(0.5) : textColor,
+          fontWeight: FontWeight.w500,
+        );
 
     Widget content;
     if (_iconPlacement == IconPlacement.top) {
diff --git a/mobile-app/lib/v2/components/quantus_icon_button.dart b/mobile-app/lib/v2/components/quantus_icon_button.dart
new file mode 100644
index 000000000..3126d72ab
--- /dev/null
+++ b/mobile-app/lib/v2/components/quantus_icon_button.dart
@@ -0,0 +1,131 @@
+import 'package:flutter/material.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/v2/components/glass_button_base.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+
+enum IconButtonShape { rounded, circular }
+
+enum IconButtonStyle { glass, flat }
+
+enum IconButtonSize { small, medium, large }
+
+class QuantusIconButton extends StatelessWidget {
+  final IconData icon;
+  final VoidCallback? onTap;
+  final IconButtonSize size;
+  final IconButtonShape shape;
+  final IconButtonStyle style;
+  final bool isDisabled;
+  final bool isLoading;
+  final bool isActive;
+  final double? radius;
+
+  const QuantusIconButton.rounded({
+    super.key,
+    required this.icon,
+    this.size = IconButtonSize.medium,
+    this.onTap,
+    this.isActive = false,
+    this.isLoading = false,
+    this.isDisabled = false,
+    this.radius,
+    this.style = IconButtonStyle.flat,
+  }) : shape = IconButtonShape.rounded;
+
+  const QuantusIconButton.circular({
+    super.key,
+    required this.icon,
+    this.size = IconButtonSize.medium,
+    this.onTap,
+    this.isActive = false,
+    this.isLoading = false,
+    this.isDisabled = false,
+    this.radius,
+    this.style = IconButtonStyle.flat,
+  }) : shape = IconButtonShape.circular;
+
+  double get buttonSize {
+    switch (size) {
+      case IconButtonSize.small:
+        return 28;
+      case IconButtonSize.medium:
+        return 36;
+      case IconButtonSize.large:
+        return 44;
+    }
+  }
+
+  double get iconSize {
+    switch (size) {
+      case IconButtonSize.small:
+        return 16;
+      case IconButtonSize.medium:
+        return 18;
+      case IconButtonSize.large:
+        return 20;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final bool disabled = onTap == null || isLoading || isDisabled;
+    final double defaultRadius = size == IconButtonSize.small ? 8 : 16;
+    final double cornerRadius = radius ?? defaultRadius;
+    final Color iconColor = isActive ? context.colors.accentOrange : context.colors.textPrimary;
+
+    final BorderRadius borderRadius;
+    switch (shape) {
+      case IconButtonShape.rounded:
+        borderRadius = BorderRadius.circular(cornerRadius);
+        break;
+      case IconButtonShape.circular:
+        borderRadius = BorderRadius.circular(buttonSize / 2);
+        break;
+    }
+
+    Widget content = Center(
+      child: isLoading
+          ? SizedBox(
+              width: iconSize,
+              height: iconSize,
+              child: CircularProgressIndicator(color: context.colors.textPrimary, strokeWidth: 1.5),
+            )
+          : Icon(icon, color: iconColor, size: iconSize),
+    );
+
+    switch (style) {
+      case IconButtonStyle.glass:
+        content = _buildGlassStyle(content, buttonSize: buttonSize, borderRadius: borderRadius);
+        break;
+      case IconButtonStyle.flat:
+        content = _buildFlatStyle(content, buttonSize: buttonSize, borderRadius: borderRadius, colors: context.colors);
+        break;
+    }
+
+    return InkWell(
+      onTap: disabled ? null : onTap,
+      borderRadius: borderRadius,
+      child: Opacity(opacity: disabled ? 0.9 : 1, child: content),
+    );
+  }
+
+  Widget _buildFlatStyle(
+    Widget child, {
+    required double buttonSize,
+    required BorderRadius borderRadius,
+    required AppColorsV2 colors,
+  }) {
+    return Container(
+      decoration: BoxDecoration(
+        color: colors.background,
+        border: BoxBorder.all(color: isActive ? colors.accentOrange.useOpacity(0.2) : colors.borderButton, width: 1),
+        borderRadius: borderRadius,
+      ),
+      child: SizedBox(width: buttonSize, height: buttonSize, child: child),
+    );
+  }
+
+  Widget _buildGlassStyle(Widget child, {required double buttonSize, required BorderRadius borderRadius}) {
+    return GlassButtonBase(buttonHeight: buttonSize, buttonWidth: buttonSize, borderRadius: borderRadius, child: child);
+  }
+}
diff --git a/mobile-app/lib/v2/components/recovery_phrase_body.dart b/mobile-app/lib/v2/components/recovery_phrase_body.dart
new file mode 100644
index 000000000..3a6bc4b2d
--- /dev/null
+++ b/mobile-app/lib/v2/components/recovery_phrase_body.dart
@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/features/components/mnemonic_grid.dart';
+import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class RecoveryPhraseBody extends StatelessWidget {
+  final String appBarTitle;
+  final List<String> words;
+  final String primaryButtonLabel;
+  final VoidCallback onPrimary;
+  final bool isGridLoading;
+  final bool isPrimaryButtonDisabled;
+  final bool isPrimaryButtonLoading;
+
+  const RecoveryPhraseBody({
+    super.key,
+    required this.appBarTitle,
+    required this.words,
+    required this.primaryButtonLabel,
+    required this.onPrimary,
+    this.isGridLoading = false,
+    this.isPrimaryButtonDisabled = false,
+    this.isPrimaryButtonLoading = false,
+  });
+
+  void _copyToClipboard(BuildContext context) {
+    context.copyTextWithToaster(words.join(' '), message: 'Recovery phrase copied to clipboard');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+
+    return ScaffoldBase(
+      appBar: V2AppBar(title: appBarTitle),
+      mainContent: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Text(
+            'Write these words down in order and keep them somewhere only you can access. Do not screenshot or copy to a notes app.',
+            style: text.smallParagraph?.copyWith(color: colors.textTertiary),
+          ),
+          const SizedBox(height: 24),
+          Expanded(
+            child: isGridLoading
+                ? const Center(child: Loader(size: 24))
+                : SingleChildScrollView(child: MnemonicGrid(words: words, isRevealed: true)),
+          ),
+        ],
+      ),
+      bottomContent: _bottomBar(context, colors),
+    );
+  }
+
+  Widget _bottomBar(BuildContext context, AppColorsV2 colors) {
+    return ScaffoldBaseBottomContent(
+      child: Row(
+        children: [
+          Expanded(
+            child: QuantusButton.simple(
+              label: 'Copy',
+              icon: Icon(Icons.copy, color: colors.textPrimary, size: 14),
+              iconPlacement: IconPlacement.leading,
+              onTap: () => _copyToClipboard(context),
+              variant: ButtonVariant.secondary,
+            ),
+          ),
+          const SizedBox(width: 24),
+          Expanded(
+            child: QuantusButton.simple(
+              label: primaryButtonLabel,
+              isDisabled: isPrimaryButtonDisabled,
+              isLoading: isPrimaryButtonLoading,
+              onTap: onPrimary,
+              variant: ButtonVariant.primary,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/scaffold_base.dart b/mobile-app/lib/v2/components/scaffold_base.dart
index 1ed823e3a..a982ede31 100644
--- a/mobile-app/lib/v2/components/scaffold_base.dart
+++ b/mobile-app/lib/v2/components/scaffold_base.dart
@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:resonance_network_wallet/features/components/network_status_banner.dart';
-import 'package:resonance_network_wallet/v2/components/gradient_background.dart';
+import 'package:resonance_network_wallet/v2/components/base_background.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 
 class ScaffoldBase extends StatelessWidget {
-  final Widget? child;
+  final Widget? mainContent;
+  final Widget? bottomContent;
   final List<Widget>? slivers;
   final Widget? appBar;
   final ScrollController? scrollController;
@@ -21,7 +22,8 @@ class ScaffoldBase extends StatelessWidget {
     this.appBar,
     this.padding = defaultPadding,
     this.backgroundWidget,
-    required Widget this.child,
+    this.bottomContent,
+    required Widget this.mainContent,
   }) : slivers = null,
        scrollController = null,
        scrollPhysics = null,
@@ -35,9 +37,10 @@ class ScaffoldBase extends StatelessWidget {
     this.backgroundWidget,
     this.scrollController,
     this.scrollPhysics = const AlwaysScrollableScrollPhysics(),
+    this.bottomContent,
     required RefreshCallback this.onRefresh,
     required List<Widget> this.slivers,
-  }) : child = null;
+  }) : mainContent = null;
 
   @override
   Widget build(BuildContext context) {
@@ -56,7 +59,7 @@ class ScaffoldBase extends StatelessWidget {
     if (backgroundWidget != null) {
       scaffoldBody = Stack(fit: StackFit.expand, children: [backgroundWidget!, scaffoldBody]);
     } else {
-      scaffoldBody = GradientBackground(child: scaffoldBody);
+      scaffoldBody = BaseBackground(child: scaffoldBody);
     }
 
     return Scaffold(body: scaffoldBody);
@@ -69,22 +72,36 @@ class ScaffoldBase extends StatelessWidget {
         onRefresh: onRefresh!,
         color: colors.textPrimary,
         backgroundColor: colors.surface,
-        child: CustomScrollView(
-          controller: scrollController,
-          physics: scrollPhysics ?? const AlwaysScrollableScrollPhysics(),
-          slivers: [
-            SliverPadding(
-              padding: padding,
-              sliver: SliverList(delegate: SliverChildListDelegate(slivers!)),
+        child: Column(
+          children: [
+            Expanded(
+              child: CustomScrollView(
+                controller: scrollController,
+                physics: scrollPhysics ?? const AlwaysScrollableScrollPhysics(),
+                slivers: [
+                  SliverPadding(
+                    padding: padding,
+                    sliver: SliverList(delegate: SliverChildListDelegate(slivers!)),
+                  ),
+                ],
+              ),
             ),
+            ?bottomContent,
           ],
         ),
       );
     }
 
     // Static content
-    if (child != null) {
-      return Padding(padding: padding, child: child!);
+    if (mainContent != null) {
+      return Column(
+        children: [
+          Expanded(
+            child: Padding(padding: padding, child: mainContent!),
+          ),
+          ?bottomContent,
+        ],
+      );
     }
 
     return const SizedBox.shrink();
diff --git a/mobile-app/lib/v2/components/scaffold_base_bottom_content.dart b/mobile-app/lib/v2/components/scaffold_base_bottom_content.dart
new file mode 100644
index 000000000..1d2ef42d3
--- /dev/null
+++ b/mobile-app/lib/v2/components/scaffold_base_bottom_content.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+
+class ScaffoldBaseBottomContent extends StatelessWidget {
+  final Widget child;
+
+  const ScaffoldBaseBottomContent({super.key, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    final padding = const EdgeInsets.all(24);
+
+    return Container(
+      padding: padding,
+      decoration: BoxDecoration(
+        border: Border(top: BorderSide(color: context.colors.surfaceDeep, width: 1)),
+      ),
+      child: child,
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/segmented_controls.dart b/mobile-app/lib/v2/components/segmented_controls.dart
new file mode 100644
index 000000000..7e0041ffc
--- /dev/null
+++ b/mobile-app/lib/v2/components/segmented_controls.dart
@@ -0,0 +1,96 @@
+import 'package:flutter/material.dart';
+import 'package:collection/collection.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class SegmentedControls<T> extends StatelessWidget {
+  final List<SegmentedControlItem<T>> items;
+  final T selectedValue;
+  final ValueChanged<T> onChanged;
+
+  static const double _padding = 5.0;
+  static const double _outerRadius = 10.5;
+  static const double _pillRadius = 8.0;
+  static const double _verticalPadding = 14.0;
+  static const Duration _duration = Duration(milliseconds: 300);
+
+  const SegmentedControls({super.key, required this.items, required this.selectedValue, required this.onChanged})
+    : assert(items.length >= 2, 'SegmentedControls requires at least 2 items');
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final selectedIndex = items.indexWhere((item) => item.value == selectedValue);
+
+    return Container(
+      padding: const EdgeInsets.all(_padding),
+      decoration: BoxDecoration(
+        color: colors.background,
+        borderRadius: BorderRadius.circular(_outerRadius),
+        border: Border.all(color: colors.txItemBorderDefault, width: 1.5),
+      ),
+      child: LayoutBuilder(
+        builder: (context, constraints) {
+          final segmentWidth = constraints.maxWidth / items.length;
+          final pillLeft = selectedIndex * segmentWidth;
+
+          return SizedBox(
+            height: _verticalPadding * 2 + 22,
+            child: Stack(
+              children: [
+                // Sliding pill
+                AnimatedPositioned(
+                  duration: _duration,
+                  curve: Curves.easeInOut,
+                  left: pillLeft,
+                  top: 0,
+                  bottom: 0,
+                  width: segmentWidth,
+                  child: Container(
+                    decoration: BoxDecoration(
+                      color: colors.segmentedControlPill,
+                      borderRadius: BorderRadius.circular(_pillRadius),
+                    ),
+                  ),
+                ),
+                // Labels row
+                Row(
+                  children: items.mapIndexed((index, item) {
+                    final isSelected = index == selectedIndex;
+                    return Expanded(
+                      child: GestureDetector(
+                        onTap: () => onChanged(item.value),
+                        behavior: HitTestBehavior.opaque,
+                        child: SizedBox(
+                          height: double.infinity,
+                          child: Center(
+                            child: AnimatedDefaultTextStyle(
+                              duration: _duration,
+                              curve: Curves.easeInOut,
+                              style: (context.themeText.smallTitle ?? const TextStyle(fontSize: 18)).copyWith(
+                                color: isSelected ? colors.textPrimary : colors.txItemIconDefault,
+                                fontWeight: FontWeight.w400,
+                              ),
+                              child: Text(item.label, textAlign: TextAlign.center),
+                            ),
+                          ),
+                        ),
+                      ),
+                    );
+                  }).toList(),
+                ),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class SegmentedControlItem<T> {
+  final T value;
+  final String label;
+
+  const SegmentedControlItem({required this.value, required this.label});
+}
diff --git a/mobile-app/lib/v2/components/share_account_button.dart b/mobile-app/lib/v2/components/share_account_button.dart
new file mode 100644
index 000000000..e8c7a3be1
--- /dev/null
+++ b/mobile-app/lib/v2/components/share_account_button.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+
+class ShareAccountButton extends StatelessWidget {
+  final VoidCallback onTap;
+  final bool isDisabled;
+
+  const ShareAccountButton({super.key, required this.onTap, this.isDisabled = false});
+
+  @override
+  Widget build(BuildContext context) {
+    return QuantusButton.simple(
+      label: 'Share',
+      onTap: onTap,
+      icon: Icon(Icons.shortcut_rounded, size: 20, color: context.colors.background),
+      iconPlacement: IconPlacement.leading,
+      isDisabled: isDisabled,
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/split_card.dart b/mobile-app/lib/v2/components/split_card.dart
new file mode 100644
index 000000000..fa4bb061b
--- /dev/null
+++ b/mobile-app/lib/v2/components/split_card.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+
+class SplitCard extends StatelessWidget {
+  final Widget topChild;
+  final Widget bottomChild;
+
+  const SplitCard({super.key, required this.topChild, required this.bottomChild});
+
+  @override
+  Widget build(BuildContext context) {
+    final topPadding = const EdgeInsets.only(top: 32, bottom: 24, left: 24, right: 24);
+    final bottomPadding = const EdgeInsets.only(top: 24, bottom: 32, left: 24, right: 24);
+
+    return Column(
+      children: [
+        Container(
+          decoration: BoxDecoration(color: context.colors.surfaceDeep, borderRadius: BorderRadius.circular(14)),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Container(padding: topPadding, child: topChild),
+              Divider(color: context.colors.background, thickness: 4),
+              Container(padding: bottomPadding, child: bottomChild),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/components/toaster.dart b/mobile-app/lib/v2/components/toaster.dart
index 3a7ef2678..2e9e290df 100644
--- a/mobile-app/lib/v2/components/toaster.dart
+++ b/mobile-app/lib/v2/components/toaster.dart
@@ -7,19 +7,20 @@ class Toaster extends StatelessWidget {
   final String message;
   final IconData iconData;
   final Color? iconColor;
+  final Color? textColor;
 
-  const Toaster({super.key, required this.message, required this.iconData, this.iconColor});
+  const Toaster({super.key, required this.message, required this.iconData, this.iconColor, this.textColor});
 
   @override
   Widget build(BuildContext context) {
-    final double iconSize = context.isTablet ? 20 : 16;
+    final double iconSize = context.isTablet ? 18 : 14;
 
     return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 20),
+      padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 7),
       decoration: ShapeDecoration(
         color: context.colors.toasterBackground,
         shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(14.22),
+          borderRadius: BorderRadius.circular(35),
           side: BorderSide(color: context.colors.toasterBorder),
         ),
       ),
@@ -27,8 +28,10 @@ class Toaster extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           Icon(iconData, color: iconColor, size: iconSize),
-          const SizedBox(width: 12),
-          Expanded(child: Text(message, style: context.themeText.smallParagraph, softWrap: true)),
+          const SizedBox(width: 9),
+          Expanded(
+            child: Text(message, style: context.themeText.detail?.copyWith(color: textColor), softWrap: true),
+          ),
         ],
       ),
     );
diff --git a/mobile-app/lib/v2/components/toaster_helper.dart b/mobile-app/lib/v2/components/toaster_helper.dart
index c98c21a9c..f877689f0 100644
--- a/mobile-app/lib/v2/components/toaster_helper.dart
+++ b/mobile-app/lib/v2/components/toaster_helper.dart
@@ -9,6 +9,7 @@ Future<void> showToaster(
   required String message,
   required IconData iconData,
   Color? iconColor,
+  Color? textColor,
   Duration duration = const Duration(seconds: 2),
   FlashBehavior behavior = FlashBehavior.floating,
 }) async {
@@ -21,21 +22,28 @@ Future<void> showToaster(
       return FlashBar(
         controller: controller,
         behavior: behavior,
+        margin: const EdgeInsets.only(bottom: 86),
         backgroundColor: Colors.transparent,
         surfaceTintColor: Colors.transparent,
         shadowColor: Colors.transparent,
         indicatorColor: Colors.transparent,
-        position: FlashPosition.top,
+        position: FlashPosition.bottom,
         clipBehavior: Clip.none,
         shouldIconPulse: false,
-        content: Toaster(message: message, iconData: iconData, iconColor: iconColor),
+        content: Toaster(message: message, iconData: iconData, iconColor: iconColor, textColor: textColor),
       );
     },
   );
 }
 
 Future<void> showCopyToaster(BuildContext context, {required String message}) async {
-  await showToaster(context, iconData: Icons.copy, message: message);
+  await showToaster(
+    context,
+    iconData: Icons.check,
+    message: message,
+    textColor: context.colors.success,
+    iconColor: context.colors.success,
+  );
 }
 
 Future<void> showWarningToaster(BuildContext context, {required String message}) async {
@@ -57,5 +65,11 @@ Future<void> showErrorToaster(BuildContext context, {required String message}) a
 }
 
 Future<void> showSuccessToaster(BuildContext context, {required String message}) async {
-  await showToaster(context, message: message, iconData: Icons.check_circle_rounded, iconColor: context.colors.success);
+  await showToaster(
+    context,
+    message: message,
+    iconData: Icons.check_circle_rounded,
+    iconColor: context.colors.success,
+    textColor: context.colors.success,
+  );
 }
diff --git a/mobile-app/lib/v2/components/v2_app_bar.dart b/mobile-app/lib/v2/components/v2_app_bar.dart
index 2dbe5f8fe..ec50d2042 100644
--- a/mobile-app/lib/v2/components/v2_app_bar.dart
+++ b/mobile-app/lib/v2/components/v2_app_bar.dart
@@ -16,7 +16,7 @@ class V2AppBar extends StatelessWidget {
     this.leading,
     this.trailing,
     this.showBackButton = true,
-    this.padding = const EdgeInsets.only(top: 16.0, bottom: 40.0),
+    this.padding = const EdgeInsets.only(top: 16.0, bottom: 32.0),
   });
 
   @override
diff --git a/mobile-app/lib/v2/screens/accounts/account_details_screen.dart b/mobile-app/lib/v2/screens/accounts/account_details_screen.dart
new file mode 100644
index 000000000..cd9b75e7f
--- /dev/null
+++ b/mobile-app/lib/v2/screens/accounts/account_details_screen.dart
@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/shared/utils/share_utils.dart';
+import 'package:resonance_network_wallet/v2/components/address_details_card.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/components/share_account_button.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+
+class AccountDetailsScreen extends StatefulWidget {
+  final Account account;
+
+  const AccountDetailsScreen({super.key, required this.account});
+
+  @override
+  State<AccountDetailsScreen> createState() => _AccountDetailsScreenState();
+}
+
+class _AccountDetailsScreenState extends State<AccountDetailsScreen> {
+  final _checksumService = HumanReadableChecksumService();
+  String? _checksum;
+  bool _isLoading = true;
+
+  @override
+  void initState() {
+    super.initState();
+    _load();
+  }
+
+  Future<void> _load() async {
+    final c = await _checksumService.getHumanReadableName(widget.account.accountId);
+    if (mounted) {
+      setState(() {
+        _checksum = c;
+        _isLoading = false;
+      });
+    }
+  }
+
+  void _share() {
+    if (_isLoading || _checksum == null) return;
+
+    shareAccountDetails(context, widget.account.accountId, checksum: _checksum!);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final account = widget.account;
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Address Details'),
+      mainContent: AddressDetailsCard(accountId: account.accountId, checksum: _checksum),
+      bottomContent: ScaffoldBaseBottomContent(
+        child: ShareAccountButton(onTap: _share, isDisabled: _isLoading),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/accounts/account_menu_screen.dart b/mobile-app/lib/v2/screens/accounts/account_menu_screen.dart
new file mode 100644
index 000000000..bb1553459
--- /dev/null
+++ b/mobile-app/lib/v2/screens/accounts/account_menu_screen.dart
@@ -0,0 +1,141 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/v2/components/account_badge.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/accounts/account_details_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/accounts/edit_account_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/recovery_phrase_confirmation_screen.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class AccountMenuScreen extends ConsumerWidget {
+  final Account initialAccount;
+
+  const AccountMenuScreen({super.key, required this.initialAccount});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final colors = context.colors;
+    final text = context.themeText;
+
+    final accounts = ref.watch(accountsProvider);
+    final account = accounts.value?.firstWhere((a) => a.accountId == initialAccount.accountId);
+
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Accounts'),
+      mainContent: account != null
+          ? Column(
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                const SizedBox(height: 8),
+                _ProfileHeader(account: account, colors: colors, text: text),
+                const SizedBox(height: 80),
+                _MenuRow(
+                  label: 'Account Name',
+                  value: account.name,
+                  onTap: () => _openNameEditor(context, ref, account),
+                ),
+                Divider(color: colors.toasterBackground, height: 1),
+                _MenuRow(label: 'Address Details', onTap: () => _openAddressDetails(context, account)),
+                Divider(color: colors.toasterBackground, height: 1),
+                _MenuRow(label: 'Show Recovery Phrase', onTap: () => _openRecoveryPhrase(context, account)),
+              ],
+            )
+          : const Center(child: Text('Account not found')),
+    );
+  }
+
+  Future<void> _openNameEditor(BuildContext context, WidgetRef ref, Account current) async {
+    await Navigator.of(
+      context,
+    ).push<void>(MaterialPageRoute(builder: (_) => EditAccountScreen(initialAccount: current)));
+    if (!context.mounted) return;
+    ref.invalidate(accountsProvider);
+  }
+
+  void _openRecoveryPhrase(BuildContext context, Account account) {
+    Navigator.of(
+      context,
+    ).push<void>(MaterialPageRoute(builder: (_) => RecoveryPhraseConfirmationScreen(walletIndex: account.walletIndex)));
+  }
+
+  void _openAddressDetails(BuildContext context, Account account) {
+    Navigator.of(context).push<void>(MaterialPageRoute(builder: (_) => AccountDetailsScreen(account: account)));
+  }
+}
+
+class _ProfileHeader extends StatelessWidget {
+  final Account account;
+  final AppColorsV2 colors;
+  final AppTextTheme text;
+
+  const _ProfileHeader({required this.account, required this.colors, required this.text});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        AccountBadge(
+          account: account,
+          isActive: true,
+          size: 96,
+          textStyle: text.largeTitle?.copyWith(
+            fontWeight: FontWeight.w500,
+            letterSpacing: -0.59,
+            height: 1,
+            fontFamily: AppTextTheme.fontFamilySecondary,
+          ),
+        ),
+        const SizedBox(height: 12),
+        Text(
+          account.name,
+          style: text.mediumTitle?.copyWith(fontWeight: FontWeight.w400, height: 1),
+          textAlign: TextAlign.center,
+        ),
+      ],
+    );
+  }
+}
+
+class _MenuRow extends StatelessWidget {
+  final String label;
+  final String? value;
+  final VoidCallback onTap;
+
+  const _MenuRow({required this.label, this.value, required this.onTap});
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: onTap,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 16),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Expanded(child: Text(label, style: text.paragraph?.copyWith(fontSize: 18))),
+
+              Row(
+                children: [
+                  if (value != null) ...[
+                    Text(value!, style: text.smallParagraph?.copyWith(color: colors.textMuted)),
+                    const SizedBox(width: 4),
+                  ],
+                  Icon(Icons.chevron_right, size: 16, color: colors.textMuted),
+                ],
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/accounts/account_ready_screen.dart b/mobile-app/lib/v2/screens/accounts/account_ready_screen.dart
new file mode 100644
index 000000000..2c173c72d
--- /dev/null
+++ b/mobile-app/lib/v2/screens/accounts/account_ready_screen.dart
@@ -0,0 +1,139 @@
+import 'package:flutter/material.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/v2/components/back_button.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/home/home_screen.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+enum AccountReadyOverviewOrigin { accountCreated, walletCreated, walletImported }
+
+class AccountReadyScreen extends StatelessWidget {
+  const AccountReadyScreen({
+    super.key,
+    required this.origin,
+    required this.accountName,
+    required this.checksumPhrase,
+    required this.accountId,
+  });
+
+  final AccountReadyOverviewOrigin origin;
+  final String accountName;
+  final String checksumPhrase;
+  final String accountId;
+
+  static const _galleryLargeTitle = Color(0xFFEBEBEB);
+  static const _successRingSize = 78.0;
+  static const _checkIconSize = 32.0;
+  static const _borderWidth = 2.0;
+
+  void _goHome(BuildContext context) {
+    Navigator.pushAndRemoveUntil(context, MaterialPageRoute<void>(builder: (_) => const HomeScreen()), (_) => false);
+  }
+
+  String get _appBarTitle => switch (origin) {
+    AccountReadyOverviewOrigin.accountCreated => 'Account Created',
+    AccountReadyOverviewOrigin.walletCreated => 'Wallet Created',
+    AccountReadyOverviewOrigin.walletImported => 'Wallet Imported',
+  };
+
+  bool get isWalletRelated =>
+      origin == AccountReadyOverviewOrigin.walletCreated || origin == AccountReadyOverviewOrigin.walletImported;
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+    final formattedAddress = AddressFormattingService.formatAddress(
+      accountId,
+      prefix: 8,
+      ellipses: '.......',
+      postFix: 10,
+    );
+    final headline = isWalletRelated ? _appBarTitle : accountName;
+
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (bool didPop, Object? result) {
+        if (!didPop) {
+          _goHome(context);
+        }
+      },
+      child: ScaffoldBase(
+        appBar: V2AppBar(
+          title: _appBarTitle,
+          leading: AppBackButton(onTap: () => _goHome(context)),
+        ),
+        mainContent: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Expanded(
+              child: Center(
+                child: SingleChildScrollView(
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Column(
+                        children: [
+                          Container(
+                            width: _successRingSize,
+                            height: _successRingSize,
+                            alignment: Alignment.center,
+                            decoration: BoxDecoration(
+                              shape: BoxShape.circle,
+                              border: Border.all(color: colors.success, width: _borderWidth),
+                            ),
+                            child: Icon(Icons.check_rounded, size: _checkIconSize, color: colors.success),
+                          ),
+                          const SizedBox(height: 16),
+                          Text(
+                            headline,
+                            textAlign: TextAlign.center,
+                            style: text.paragraph?.copyWith(fontSize: 32, color: _galleryLargeTitle, height: 1.0),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 32),
+                      if (isWalletRelated) ...[
+                        Text(
+                          accountName,
+                          textAlign: TextAlign.center,
+                          style: text.transactionDetailRowLabel?.copyWith(color: colors.textTertiary),
+                        ),
+                        const SizedBox(height: 12),
+                      ],
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 4),
+                        child: Column(
+                          children: [
+                            Text(
+                              checksumPhrase,
+                              textAlign: TextAlign.center,
+                              style: text.smallParagraph?.copyWith(color: colors.checksum, fontWeight: FontWeight.w400),
+                            ),
+                            const SizedBox(height: 4),
+                            Text(
+                              formattedAddress.toLowerCase(),
+                              textAlign: TextAlign.center,
+                              style: text.transactionDetailRowValue?.copyWith(fontSize: 14),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+        bottomContent: ScaffoldBaseBottomContent(
+          child: QuantusButton.simple(label: 'Done', onTap: () => _goHome(context), variant: ButtonVariant.primary),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/accounts/account_shared_components.dart b/mobile-app/lib/v2/screens/accounts/account_shared_components.dart
deleted file mode 100644
index a92836180..000000000
--- a/mobile-app/lib/v2/screens/accounts/account_shared_components.dart
+++ /dev/null
@@ -1,89 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:resonance_network_wallet/v2/components/glass_icon_button.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-
-class AccountField extends StatelessWidget {
-  final Widget child;
-  final Widget? trailing;
-  final EdgeInsets padding;
-
-  const AccountField({
-    super.key,
-    required this.child,
-    this.trailing,
-    this.padding = const EdgeInsets.fromLTRB(16, 8, 8, 8),
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: padding,
-      decoration: BoxDecoration(color: context.colors.surfaceGlass, borderRadius: BorderRadius.circular(14)),
-      child: Row(
-        children: [
-          Expanded(child: child),
-          if (trailing != null) ...[const SizedBox(width: 8), trailing!],
-        ],
-      ),
-    );
-  }
-}
-
-class AccountCopyRow extends StatelessWidget {
-  final String value;
-  final VoidCallback onCopy;
-  final TextStyle textStyle;
-  final int? maxLines;
-  final TextOverflow overflow;
-
-  const AccountCopyRow({
-    super.key,
-    required this.value,
-    required this.onCopy,
-    required this.textStyle,
-    this.maxLines = 1,
-    this.overflow = TextOverflow.ellipsis,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Expanded(
-          child: Text(value, maxLines: maxLines, overflow: overflow, style: textStyle),
-        ),
-        const SizedBox(width: 8),
-        AccountIconActionButton(icon: Icons.copy_outlined, isTiny: true, onTap: onCopy),
-      ],
-    );
-  }
-}
-
-class AccountIconActionButton extends StatelessWidget {
-  final IconData icon;
-  final VoidCallback onTap;
-  final bool isTiny;
-
-  const AccountIconActionButton({super.key, required this.icon, required this.onTap, this.isTiny = false});
-
-  @override
-  Widget build(BuildContext context) {
-    return GlassIconButton.rounded(
-      icon: icon,
-      onTap: onTap,
-      size: isTiny ? IconButtonSize.small : IconButtonSize.medium,
-    );
-  }
-}
-
-const accountFieldDecoration = InputDecoration(
-  filled: true,
-  fillColor: Colors.transparent,
-  border: InputBorder.none,
-  enabledBorder: InputBorder.none,
-  focusedBorder: InputBorder.none,
-  disabledBorder: InputBorder.none,
-  isDense: true,
-  contentPadding: EdgeInsets.zero,
-);
diff --git a/mobile-app/lib/v2/screens/accounts/accounts_sheet.dart b/mobile-app/lib/v2/screens/accounts/accounts_sheet.dart
index bca4d3227..a838dca8e 100644
--- a/mobile-app/lib/v2/screens/accounts/accounts_sheet.dart
+++ b/mobile-app/lib/v2/screens/accounts/accounts_sheet.dart
@@ -1,20 +1,17 @@
-import 'package:collection/collection.dart';
 import 'dart:math' as math;
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/features/components/account_gradient_image.dart';
-import 'package:resonance_network_wallet/v2/screens/accounts/add_hardware_account_screen.dart';
-import 'package:resonance_network_wallet/services/firebase_messaging_service.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
+import 'package:resonance_network_wallet/v2/components/account_badge.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_icon_button.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/v2/components/bottom_sheet_container.dart';
-import 'package:resonance_network_wallet/v2/screens/accounts/account_shared_components.dart';
-import 'package:resonance_network_wallet/v2/screens/accounts/create_account_view.dart';
-import 'package:resonance_network_wallet/v2/screens/accounts/edit_account_view.dart';
-import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
+import 'package:resonance_network_wallet/v2/screens/accounts/account_menu_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/accounts/add_account_menu_screen.dart';
 import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
 
 Future<T?> showAccountsSheet<T>(BuildContext context) async {
@@ -29,40 +26,6 @@ class AccountsSheet extends ConsumerStatefulWidget {
 }
 
 class _AccountsScreenState extends ConsumerState<AccountsSheet> {
-  final AccountsService _accountsService = AccountsService();
-  final NumberFormattingService _formattingService = NumberFormattingService();
-  final HumanReadableChecksumService _checksumService = HumanReadableChecksumService();
-  final TextEditingController _nameController = TextEditingController();
-  final TextEditingController _createNameController = TextEditingController();
-
-  bool _isCreatingAccount = false;
-  bool _isSavingCreatedAccount = false;
-  bool _isEditingName = false;
-  bool _isEditingCreatedName = false;
-  bool _isSavingName = false;
-  bool _isCreateViewOpen = false;
-  String? _editingAccountId;
-  String _editingAccountChecksum = 'Loading...';
-  Account? _draftAccount;
-  String _draftChecksum = 'Loading...';
-
-  bool _isHardwareWallet(List<Account> accounts) {
-    return accounts.isNotEmpty && accounts.every((a) => a.accountType == AccountType.keystone);
-  }
-
-  int _walletIndexForActiveAccount(List<Account> accounts, DisplayAccount? activeDisplayAccount) {
-    if (activeDisplayAccount is RegularAccount) {
-      return activeDisplayAccount.account.walletIndex;
-    }
-
-    if (activeDisplayAccount is EntrustedDisplayAccount) {
-      final parent = accounts.firstWhereOrNull((a) => a.accountId == activeDisplayAccount.account.parentAccountId);
-      if (parent != null) return parent.walletIndex;
-    }
-
-    return accounts.isNotEmpty ? accounts.first.walletIndex : 0;
-  }
-
   List<Account> _displayAccounts(List<Account> accounts) {
     final sorted = [...accounts];
     sorted.sort((a, b) {
@@ -73,46 +36,11 @@ class _AccountsScreenState extends ConsumerState<AccountsSheet> {
     return sorted;
   }
 
-  Future<void> _createNewAccount() async {
-    if (_isCreatingAccount) return;
-
-    setState(() => _isCreatingAccount = true);
-    try {
-      final accounts = ref.read(accountsProvider).value ?? <Account>[];
-      final activeDisplayAccount = ref.read(activeAccountProvider).value;
-      final walletIndex = _walletIndexForActiveAccount(accounts, activeDisplayAccount);
-      final selectedWalletAccounts = accounts.where((a) => a.walletIndex == walletIndex).toList();
-
-      if (_isHardwareWallet(selectedWalletAccounts)) {
-        final created = await Navigator.push<bool?>(
-          context,
-          MaterialPageRoute(builder: (context) => AddHardwareAccountScreen(walletIndex: walletIndex)),
-        );
-        if (created == true) {
-          ref.invalidate(accountsProvider);
-          ref.invalidate(activeAccountProvider);
-        }
-      } else {
-        final draft = await _accountsService.createNewAccount(walletIndex: walletIndex);
-        final checksum = await _checksumService.getHumanReadableName(draft.accountId);
-        if (!mounted) return;
-        _createNameController.text = draft.name;
-        setState(() {
-          _draftAccount = draft;
-          _draftChecksum = checksum;
-          _isCreateViewOpen = true;
-          _isEditingCreatedName = false;
-        });
-      }
-    } catch (_) {
-      if (mounted) {
-        context.showErrorToaster(message: 'Could not add account.');
-      }
-    } finally {
-      if (mounted) {
-        setState(() => _isCreatingAccount = false);
-      }
-    }
+  void _openAddAccountMenu() {
+    Navigator.of(
+      context,
+      rootNavigator: true,
+    ).push<void>(MaterialPageRoute<void>(builder: (_) => const AddAccountMenuScreen()));
   }
 
   Future<void> _switchAccount(Account account) async {
@@ -122,78 +50,8 @@ class _AccountsScreenState extends ConsumerState<AccountsSheet> {
     }
   }
 
-  Future<void> _openEdit(Account account) async {
-    _nameController.text = account.name;
-
-    setState(() {
-      _editingAccountId = account.accountId;
-      _isEditingName = false;
-    });
-
-    final checksum = await _checksumService.getHumanReadableName(account.accountId);
-    if (!mounted) return;
-    setState(() {
-      _editingAccountChecksum = checksum;
-    });
-  }
-
-  void _closeEdit() {
-    setState(() {
-      _editingAccountId = null;
-      _isEditingName = false;
-      _isSavingName = false;
-      _editingAccountChecksum = 'Loading...';
-    });
-  }
-
-  void _closeCreateView() {
-    setState(() {
-      _isCreateViewOpen = false;
-      _isEditingCreatedName = false;
-      _isSavingCreatedAccount = false;
-      _draftAccount = null;
-      _draftChecksum = 'Loading...';
-      _createNameController.clear();
-    });
-  }
-
-  Future<void> _saveEditedName(Account account) async {
-    final name = _nameController.text.trim();
-    if (name.isEmpty) {
-      context.showErrorToaster(message: "Account name can't be empty");
-      return;
-    }
-    if (name == account.name) {
-      setState(() => _isEditingName = false);
-      return;
-    }
-
-    setState(() => _isSavingName = true);
-    try {
-      await _accountsService.updateAccountName(account, name);
-      ref.invalidate(accountsProvider);
-      ref.invalidate(activeAccountProvider);
-      if (mounted) {
-        setState(() {
-          _isEditingName = false;
-        });
-      }
-    } catch (_) {
-      if (mounted) {
-        context.showErrorToaster(message: 'Failed to rename account.');
-      }
-    } finally {
-      if (mounted) {
-        setState(() => _isSavingName = false);
-      }
-    }
-  }
-
-  @override
-  void dispose() {
-    _nameController.dispose();
-    _createNameController.dispose();
-    super.dispose();
+  void _openAccountMenu(Account account) {
+    Navigator.of(context).push<void>(MaterialPageRoute(builder: (_) => AccountMenuScreen(initialAccount: account)));
   }
 
   @override
@@ -205,51 +63,19 @@ class _AccountsScreenState extends ConsumerState<AccountsSheet> {
     final activeDisplayAccount = activeDisplayAccountAsync.value;
     final displayAccounts = _displayAccounts(accounts);
     final activeAccountId = activeDisplayAccount?.account.accountId;
-    final editingAccount = _editingAccountId == null
-        ? null
-        : displayAccounts.firstWhereOrNull((a) => a.accountId == _editingAccountId);
-
-    String title = 'Accounts';
-    VoidCallback? onBack;
-    Widget titleBuilder(String title) => Row(
-      spacing: 12,
-      children: [
-        SizedBox(
-          width: 32.0,
-          height: 32.0,
-          child: AccountGradientImage(accountId: activeAccountId ?? 'loading..', width: 32.0, height: 32.0),
-        ),
-        Text(
-          title,
-          style: context.themeText.smallTitle?.copyWith(color: context.colors.textPrimary, fontSize: 20),
-          textAlign: TextAlign.center,
-        ),
-      ],
-    );
 
     final media = MediaQuery.of(context);
     final maxHeight = media.size.height - media.padding.top - 20;
     final sheetHeight = math.min(610.0, maxHeight);
 
-    if (_isCreateViewOpen && _draftAccount != null) {
-      title = 'New Account';
-      onBack = _closeCreateView;
-    } else if (editingAccount != null) {
-      title = 'Edit Account';
-      onBack = _closeEdit;
-    }
-
     return BottomSheetContainer(
-      title: title,
-      titleBuilder: editingAccount == null && !_isCreateViewOpen ? titleBuilder : null,
-      onBack: onBack,
+      title: 'Accounts',
       height: sheetHeight,
       child: _buildContent(
         accountsAsync: accountsAsync,
         activeDisplayAccountAsync: activeDisplayAccountAsync,
         displayAccounts: displayAccounts,
         activeAccountId: activeAccountId,
-        editingAccount: editingAccount,
       ),
     );
   }
@@ -259,17 +85,16 @@ class _AccountsScreenState extends ConsumerState<AccountsSheet> {
     required AsyncValue<DisplayAccount?> activeDisplayAccountAsync,
     required List<Account> displayAccounts,
     required String? activeAccountId,
-    required Account? editingAccount,
   }) {
     if (accountsAsync.isLoading || activeDisplayAccountAsync.isLoading) {
-      return const Center(child: CircularProgressIndicator(color: Colors.white));
+      return const Center(child: Loader());
     }
 
     if (accountsAsync.hasError) {
       return Center(
         child: Text(
           'Failed to load accounts.',
-          style: context.themeText.smallParagraph?.copyWith(color: Colors.white70),
+          style: context.themeText.smallParagraph?.copyWith(color: context.colors.textSecondary),
         ),
       );
     }
@@ -278,39 +103,11 @@ class _AccountsScreenState extends ConsumerState<AccountsSheet> {
       return Center(
         child: Text(
           'Failed to load active account.',
-          style: context.themeText.smallParagraph?.copyWith(color: Colors.white70),
+          style: context.themeText.smallParagraph?.copyWith(color: context.colors.textSecondary),
         ),
       );
     }
 
-    if (_isCreateViewOpen && _draftAccount != null) {
-      return CreateAccountView(
-        draftAccount: _draftAccount!,
-        draftChecksum: _draftChecksum,
-        isSaving: _isSavingCreatedAccount,
-        isEditingName: _isEditingCreatedName,
-        nameController: _createNameController,
-        onToggleEditingName: () => setState(() => _isEditingCreatedName = !_isEditingCreatedName),
-        onSubmit: _submitCreatedAccount,
-      );
-    }
-
-    if (editingAccount != null) {
-      if (!_isEditingName && _nameController.text != editingAccount.name) {
-        _nameController.text = editingAccount.name;
-      }
-
-      return EditAccountView(
-        account: editingAccount,
-        checksum: _editingAccountChecksum,
-        isEditingName: _isEditingName,
-        isSavingName: _isSavingName,
-        nameController: _nameController,
-        onToggleEditingName: () => setState(() => _isEditingName = !_isEditingName),
-        onSaveName: () => _saveEditedName(editingAccount),
-      );
-    }
-
     return _buildAccountsListView(displayAccounts, activeAccountId);
   }
 
@@ -323,94 +120,91 @@ class _AccountsScreenState extends ConsumerState<AccountsSheet> {
               ? Center(
                   child: Text(
                     'No accounts found.',
-                    style: context.themeText.smallParagraph?.copyWith(color: Colors.white70),
+                    style: context.themeText.smallParagraph?.copyWith(color: context.colors.textSecondary),
                   ),
                 )
               : ListView.separated(
                   itemCount: displayAccounts.length,
-                  separatorBuilder: (_, _) => const SizedBox(height: 20),
+                  separatorBuilder: (_, _) => const SizedBox(height: 14),
                   itemBuilder: (_, index) {
                     final account = displayAccounts[index];
-                    return _buildAccountRow(account, account.accountId == activeAccountId);
+                    final isActive = account.accountId == activeAccountId;
+
+                    return _buildAccountRow(account, isActive);
                   },
                 ),
         ),
         const SizedBox(height: 24),
-        GlassButton.simple(label: 'Add Account', onTap: _createNewAccount, isLoading: _isCreatingAccount),
+        QuantusButton.simple(label: 'Add Account', onTap: _openAddAccountMenu, variant: ButtonVariant.primary),
       ],
     );
   }
 
   Widget _buildAccountRow(Account account, bool isActive) {
     final balanceAsync = ref.watch(balanceProviderFamily(account.accountId));
+    final formattingService = ref.watch(numberFormattingServiceProvider);
     final balanceText = balanceAsync.when(
       loading: () => 'Loading...',
       error: (_, _) => 'Balance unavailable',
-      data: (balance) => '${_formattingService.formatBalance(balance)} ${AppConstants.tokenSymbol}',
+      data: (balance) => '${formattingService.formatBalance(balance)} ${AppConstants.tokenSymbol}',
     );
+    final colors = context.colors;
 
     return GestureDetector(
       onTap: () => _switchAccount(account),
       child: Container(
-        padding: const EdgeInsets.fromLTRB(16, 12, 12, 12),
+        padding: const EdgeInsets.all(16),
         decoration: BoxDecoration(
+          color: colors.surfaceDeep,
           borderRadius: BorderRadius.circular(14),
-          border: Border.all(color: context.colors.borderSubtle, width: 0.9),
+          border: isActive ? Border.all(color: colors.borderButton) : null,
         ),
         child: Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  Text(
-                    account.name,
-                    style: context.themeText.paragraph!.copyWith(
-                      fontWeight: FontWeight.w500,
-                      color: isActive ? context.colors.accentPink : Colors.white,
+                  AccountBadge(account: account, isActive: isActive),
+                  const SizedBox(width: 12),
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          account.name,
+                          style: context.themeText.paragraph!.copyWith(
+                            fontSize: 18,
+                            fontWeight: FontWeight.w400,
+                            color: colors.textPrimary,
+                            height: 1,
+                          ),
+                        ),
+                        const SizedBox(height: 8),
+                        Text(
+                          balanceText,
+                          style: context.themeText.smallParagraph!.copyWith(
+                            fontSize: 14,
+                            color: colors.textTertiary,
+                            height: 1,
+                          ),
+                        ),
+                      ],
                     ),
                   ),
-                  const SizedBox(height: 4),
-                  Text(balanceText, style: context.themeText.detail!.copyWith(color: context.colors.textSecondary)),
                 ],
               ),
             ),
-            const SizedBox(width: 12),
-            AccountIconActionButton(icon: Icons.edit_outlined, onTap: () => _openEdit(account)),
+            const SizedBox(width: 8),
+            QuantusIconButton.circular(
+              icon: Icons.edit_outlined,
+              onTap: () => _openAccountMenu(account),
+              size: IconButtonSize.medium,
+            ),
           ],
         ),
       ),
     );
   }
-
-  Future<void> _submitCreatedAccount() async {
-    final draft = _draftAccount;
-    if (draft == null) return;
-    final name = _createNameController.text.trim();
-    if (name.isEmpty) {
-      context.showErrorToaster(message: "Account name can't be empty");
-      return;
-    }
-
-    setState(() => _isSavingCreatedAccount = true);
-    try {
-      final accountToSave = draft.copyWith(name: name);
-      await _accountsService.addAccount(accountToSave);
-      ref.invalidate(accountsProvider);
-      ref.invalidate(activeAccountProvider);
-      ref.read(firebaseMessagingServiceProvider).insertNewAddress(accountToSave.accountId);
-
-      if (mounted) {
-        _closeCreateView();
-      }
-    } catch (_) {
-      if (mounted) {
-        context.showErrorToaster(message: 'Failed to create account.');
-      }
-    } finally {
-      if (mounted) {
-        setState(() => _isSavingCreatedAccount = false);
-      }
-    }
-  }
 }
diff --git a/mobile-app/lib/v2/screens/accounts/add_account_menu_screen.dart b/mobile-app/lib/v2/screens/accounts/add_account_menu_screen.dart
new file mode 100644
index 000000000..cc5ee0357
--- /dev/null
+++ b/mobile-app/lib/v2/screens/accounts/add_account_menu_screen.dart
@@ -0,0 +1,119 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/shared/utils/account_utils.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/accounts/create_account_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/import/import_wallet_screen.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class AddAccountMenuScreen extends ConsumerStatefulWidget {
+  const AddAccountMenuScreen({super.key});
+
+  @override
+  ConsumerState<AddAccountMenuScreen> createState() => _AddAccountMenuScreenState();
+}
+
+class _AddAccountMenuScreenState extends ConsumerState<AddAccountMenuScreen> {
+  void _onCreateNewAccount() {
+    Navigator.of(context).push(MaterialPageRoute(builder: (_) => const CreateAccountScreen()));
+  }
+
+  void _onImportWallet() {
+    final accounts = ref.read(accountsProvider).value ?? <Account>[];
+    final walletIndex = nextNonHardwareWalletIndex(accounts);
+
+    Navigator.of(context).push(MaterialPageRoute(builder: (_) => ImportWalletScreenV2(walletIndex: walletIndex)));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Add Account'),
+      mainContent: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          _AddMenuRow(
+            icon: Icons.add,
+            title: 'Create New Account',
+            subtitle: 'Generate a fresh wallet address',
+            onTap: _onCreateNewAccount,
+            colors: colors,
+            text: context.themeText,
+          ),
+          const SizedBox(height: 16),
+          Divider(color: colors.toasterBackground, height: 1),
+          const SizedBox(height: 24),
+          _AddMenuRow(
+            icon: Icons.save_alt,
+            title: 'Import Wallet',
+            subtitle: 'Use a recovery phrase to import',
+            onTap: _onImportWallet,
+            colors: colors,
+            text: context.themeText,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _AddMenuRow extends StatelessWidget {
+  const _AddMenuRow({
+    required this.icon,
+    required this.title,
+    required this.subtitle,
+    required this.onTap,
+    required this.colors,
+    required this.text,
+  });
+
+  final IconData icon;
+  final String title;
+  final String subtitle;
+  final VoidCallback onTap;
+  final AppColorsV2 colors;
+  final AppTextTheme text;
+
+  @override
+  Widget build(BuildContext context) {
+    final containerSize = 40.0;
+    final iconSize = 20.0;
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(8),
+        child: Row(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            SizedBox(
+              width: containerSize,
+              height: containerSize,
+              child: Center(
+                child: Icon(icon, size: iconSize, color: colors.accentOrange),
+              ),
+            ),
+            const SizedBox(width: 12),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(title, style: text.paragraph?.copyWith(fontSize: 18)),
+                  Text(subtitle, style: text.smallParagraph?.copyWith(color: colors.textTertiary)),
+                ],
+              ),
+            ),
+            Icon(Icons.chevron_right, size: 14, color: colors.textMuted),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/accounts/add_hardware_account_screen.dart b/mobile-app/lib/v2/screens/accounts/add_hardware_account_screen.dart
index 2bf63aafb..0cde50d78 100644
--- a/mobile-app/lib/v2/screens/accounts/add_hardware_account_screen.dart
+++ b/mobile-app/lib/v2/screens/accounts/add_hardware_account_screen.dart
@@ -98,7 +98,7 @@ class _AddHardwareAccountScreenState extends ConsumerState<AddHardwareAccountScr
     final title = widget.isNewWallet ? 'Add Hardware Wallet' : 'Add Hardware Account';
     return ScaffoldBase(
       appBar: WalletAppBar(title: title),
-      child: Column(
+      mainContent: Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
           const SizedBox(height: 20),
diff --git a/mobile-app/lib/v2/screens/accounts/create_account_screen.dart b/mobile-app/lib/v2/screens/accounts/create_account_screen.dart
new file mode 100644
index 000000000..81ee80863
--- /dev/null
+++ b/mobile-app/lib/v2/screens/accounts/create_account_screen.dart
@@ -0,0 +1,139 @@
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/services/firebase_messaging_service.dart';
+import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
+import 'package:resonance_network_wallet/v2/components/name_field.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/accounts/account_ready_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/accounts/add_hardware_account_screen.dart';
+
+class CreateAccountScreen extends ConsumerStatefulWidget {
+  const CreateAccountScreen({super.key});
+
+  @override
+  ConsumerState<CreateAccountScreen> createState() => _CreateAccountScreenState();
+}
+
+class _CreateAccountScreenState extends ConsumerState<CreateAccountScreen> {
+  final _accountName = TextEditingController();
+  final _accountsService = AccountsService();
+  final _checksumService = HumanReadableChecksumService();
+
+  List<Account> _accounts = [];
+  int _walletIndex = 0;
+  bool _isLoading = false;
+  String? _error;
+
+  bool get _isDisabled => _accountName.text.isEmpty || _isLoading || _error != null;
+
+  int _walletIndexForActiveAccount(List<Account> accounts, DisplayAccount? activeDisplayAccount) {
+    if (activeDisplayAccount is RegularAccount) {
+      return activeDisplayAccount.account.walletIndex;
+    }
+    if (activeDisplayAccount is EntrustedDisplayAccount) {
+      final parent = accounts.firstWhereOrNull((a) => a.accountId == activeDisplayAccount.account.parentAccountId);
+      if (parent != null) return parent.walletIndex;
+    }
+    return accounts.isNotEmpty ? accounts.first.walletIndex : 0;
+  }
+
+  bool _isHardwareWallet(List<Account> accounts) {
+    return accounts.isNotEmpty && accounts.every((a) => a.accountType == AccountType.keystone);
+  }
+
+  Future<void> _createAccount() async {
+    setState(() => _isLoading = true);
+
+    try {
+      final selectedWalletAccounts = _accounts.where((a) => a.walletIndex == _walletIndex).toList();
+
+      if (_isHardwareWallet(selectedWalletAccounts)) {
+        final created = await Navigator.push<bool?>(
+          context,
+          MaterialPageRoute(builder: (context) => AddHardwareAccountScreen(walletIndex: _walletIndex)),
+        );
+        if (created == true) {
+          ref.invalidate(accountsProvider);
+          ref.invalidate(activeAccountProvider);
+          if (mounted) Navigator.of(context).pop();
+        }
+      } else {
+        final draft = await _accountsService.createNewAccount(walletIndex: _walletIndex);
+        final checksum = await _checksumService.getHumanReadableName(draft.accountId);
+
+        final accountToSave = draft.copyWith(name: _accountName.text.trim());
+        await _accountsService.addAccount(accountToSave);
+
+        ref.invalidate(accountsProvider);
+        ref.invalidate(activeAccountProvider);
+        ref.read(firebaseMessagingServiceProvider).insertNewAddress(accountToSave.accountId);
+
+        if (mounted) {
+          Navigator.push(
+            context,
+            MaterialPageRoute(
+              builder: (context) => AccountReadyScreen(
+                origin: AccountReadyOverviewOrigin.accountCreated,
+                accountName: accountToSave.name,
+                checksumPhrase: checksum,
+                accountId: accountToSave.accountId,
+              ),
+            ),
+          );
+        }
+      }
+    } catch (_) {
+      if (mounted) {
+        context.showErrorToaster(message: 'Could not add account.');
+      }
+    } finally {
+      if (mounted) {
+        setState(() => _isLoading = false);
+      }
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+
+    final activeAccount = ref.read(activeAccountProvider).value;
+    _accounts = ref.read(accountsProvider).value ?? <Account>[];
+    _walletIndex = _walletIndexForActiveAccount(_accounts, activeAccount);
+
+    _accountName.text = 'Account ${_accounts.length + 1}';
+    _accountName.addListener(() => setState(() {}));
+  }
+
+  @override
+  void dispose() {
+    _accountName.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Account Name'),
+      mainContent: NameField(
+        controller: _accountName,
+        subtitle: "Give this account a name you'll recognize. You can change it anytime.",
+        error: _error,
+      ),
+      bottomContent: ScaffoldBaseBottomContent(
+        child: QuantusButton.simple(
+          label: 'Create',
+          onTap: _createAccount,
+          isLoading: _isLoading,
+          isDisabled: _isDisabled,
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/accounts/create_account_view.dart b/mobile-app/lib/v2/screens/accounts/create_account_view.dart
deleted file mode 100644
index ca27a0b38..000000000
--- a/mobile-app/lib/v2/screens/accounts/create_account_view.dart
+++ /dev/null
@@ -1,99 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/features/styles/app_text_theme.dart';
-import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/screens/accounts/account_shared_components.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-
-class CreateAccountView extends StatelessWidget {
-  final Account draftAccount;
-  final String draftChecksum;
-  final bool isSaving;
-  final bool isEditingName;
-  final TextEditingController nameController;
-  final VoidCallback onToggleEditingName;
-  final VoidCallback onSubmit;
-
-  const CreateAccountView({
-    super.key,
-    required this.draftAccount,
-    required this.draftChecksum,
-    required this.isSaving,
-    required this.isEditingName,
-    required this.nameController,
-    required this.onToggleEditingName,
-    required this.onSubmit,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Expanded(
-          child: SingleChildScrollView(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text('Wallet Name', style: context.themeText.smallParagraph),
-                const SizedBox(height: 12),
-                _buildCreatedNameField(context),
-                const SizedBox(height: 40),
-                Text('Wallet Address', style: context.themeText.smallParagraph),
-                const SizedBox(height: 12),
-                _buildCreateField(
-                  context,
-                  value: AddressFormattingService.formatAddress(draftAccount.accountId),
-                  onCopy: () => context.copyTextWithToaster(draftAccount.accountId),
-                  textStyle: context.themeText.smallParagraph!.copyWith(fontWeight: FontWeight.w500),
-                ),
-                const SizedBox(height: 40),
-                Text('Wallet Checkphrase', style: context.themeText.smallParagraph),
-                const SizedBox(height: 12),
-                _buildCreateField(
-                  context,
-                  value: draftChecksum,
-                  onCopy: () => context.copyTextWithToaster(draftChecksum),
-                  textStyle: context.themeText.smallParagraph!.copyWith(color: context.colors.accentPink),
-                ),
-              ],
-            ),
-          ),
-        ),
-        const SizedBox(height: 24),
-        GlassButton.simple(label: 'Create Account', isLoading: isSaving, onTap: onSubmit),
-      ],
-    );
-  }
-
-  Widget _buildCreatedNameField(BuildContext context) {
-    return AccountField(
-      padding: const EdgeInsets.fromLTRB(12, 8, 8, 8),
-      trailing: AccountIconActionButton(
-        icon: isEditingName ? Icons.check : Icons.edit_outlined,
-        onTap: onToggleEditingName,
-      ),
-      child: TextField(
-        controller: nameController,
-        readOnly: !isEditingName || isSaving,
-        style: context.themeText.smallParagraph,
-        cursorColor: Colors.white,
-        decoration: accountFieldDecoration,
-      ),
-    );
-  }
-
-  Widget _buildCreateField(
-    BuildContext context, {
-    required String value,
-    required VoidCallback onCopy,
-    required TextStyle textStyle,
-  }) {
-    return AccountField(
-      padding: const EdgeInsets.fromLTRB(12, 8, 8, 8),
-      trailing: AccountIconActionButton(icon: Icons.copy_outlined, onTap: onCopy),
-      child: Text(value, maxLines: 1, overflow: TextOverflow.ellipsis, style: textStyle),
-    );
-  }
-}
diff --git a/mobile-app/lib/v2/screens/accounts/edit_account_screen.dart b/mobile-app/lib/v2/screens/accounts/edit_account_screen.dart
new file mode 100644
index 000000000..b59fc54f5
--- /dev/null
+++ b/mobile-app/lib/v2/screens/accounts/edit_account_screen.dart
@@ -0,0 +1,79 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
+import 'package:resonance_network_wallet/v2/components/name_field.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+
+class EditAccountScreen extends ConsumerStatefulWidget {
+  final Account initialAccount;
+
+  const EditAccountScreen({super.key, required this.initialAccount});
+
+  @override
+  ConsumerState<EditAccountScreen> createState() => EditAccountScreenState();
+}
+
+class EditAccountScreenState extends ConsumerState<EditAccountScreen> {
+  late final TextEditingController _controller;
+  final _accountsService = AccountsService();
+  bool _saving = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = TextEditingController(text: widget.initialAccount.name);
+    _controller.addListener(() => setState(() {}));
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  Future<void> _save() async {
+    final name = _controller.text.trim();
+    if (name.isEmpty) {
+      context.showErrorToaster(message: "Account name can't be empty");
+      return;
+    }
+    if (name == widget.initialAccount.name) {
+      if (mounted) Navigator.of(context).pop();
+      return;
+    }
+    setState(() => _saving = true);
+    try {
+      await _accountsService.updateAccountName(widget.initialAccount, name);
+      if (mounted) {
+        ref.invalidate(accountsProvider);
+        ref.invalidate(activeAccountProvider);
+        Navigator.of(context).pop();
+      }
+    } catch (_) {
+      if (mounted) {
+        context.showErrorToaster(message: 'Failed to rename account.');
+      }
+    } finally {
+      if (mounted) setState(() => _saving = false);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Account Name'),
+      mainContent: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [NameField(controller: _controller)],
+      ),
+      bottomContent: ScaffoldBaseBottomContent(
+        child: QuantusButton.simple(variant: ButtonVariant.primary, label: 'Done', onTap: _save, isLoading: _saving),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/accounts/edit_account_view.dart b/mobile-app/lib/v2/screens/accounts/edit_account_view.dart
deleted file mode 100644
index d27e74e59..000000000
--- a/mobile-app/lib/v2/screens/accounts/edit_account_view.dart
+++ /dev/null
@@ -1,130 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/features/styles/app_text_theme.dart';
-import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
-import 'package:resonance_network_wallet/shared/utils/share_utils.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/screens/accounts/account_shared_components.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-
-class EditAccountView extends StatelessWidget {
-  final Account account;
-  final String checksum;
-  final bool isEditingName;
-  final bool isSavingName;
-  final TextEditingController nameController;
-  final VoidCallback onToggleEditingName;
-  final VoidCallback onSaveName;
-
-  const EditAccountView({
-    super.key,
-    required this.account,
-    required this.checksum,
-    required this.isEditingName,
-    required this.isSavingName,
-    required this.nameController,
-    required this.onToggleEditingName,
-    required this.onSaveName,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Expanded(
-          child: SingleChildScrollView(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text('Account Name', style: context.themeText.smallParagraph),
-                const SizedBox(height: 12),
-                _buildAccountNameField(context),
-                const SizedBox(height: 40),
-                Text('Address Details', style: context.themeText.smallParagraph),
-                const SizedBox(height: 12),
-                _buildAddressDetails(context),
-              ],
-            ),
-          ),
-        ),
-        const SizedBox(height: 24),
-        GlassButton.simple(
-          label: 'Share Account Details',
-          onTap: () => shareAccountDetails(context, account.accountId, checksum: checksum),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildAccountNameField(BuildContext context) {
-    return AccountField(
-      trailing: isSavingName
-          ? const SizedBox(
-              width: 40,
-              height: 40,
-              child: Center(
-                child: SizedBox(
-                  width: 16,
-                  height: 16,
-                  child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white),
-                ),
-              ),
-            )
-          : AccountIconActionButton(
-              icon: isEditingName ? Icons.check : Icons.edit_outlined,
-              onTap: () {
-                if (isEditingName) {
-                  onSaveName();
-                } else {
-                  onToggleEditingName();
-                }
-              },
-            ),
-      child: TextField(
-        controller: nameController,
-        readOnly: !isEditingName || isSavingName,
-        style: context.themeText.smallParagraph!.copyWith(
-          fontWeight: FontWeight.w500,
-          color: context.colors.accentPink,
-        ),
-        cursorColor: context.colors.accentPink,
-        decoration: accountFieldDecoration,
-        onSubmitted: (_) {
-          if (isEditingName && !isSavingName) {
-            onSaveName();
-          }
-        },
-        onTap: () {
-          if (!isEditingName) {
-            onToggleEditingName();
-          }
-        },
-      ),
-    );
-  }
-
-  Widget _buildAddressDetails(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.all(16),
-      decoration: BoxDecoration(color: context.colors.surfaceGlass, borderRadius: BorderRadius.circular(14)),
-      child: Column(
-        children: [
-          AccountCopyRow(
-            value: account.accountId,
-            onCopy: () => context.copyTextWithToaster(account.accountId),
-            textStyle: context.themeText.smallParagraph!.copyWith(fontWeight: FontWeight.w500),
-            maxLines: null,
-            overflow: TextOverflow.visible,
-          ),
-          const SizedBox(height: 8),
-          AccountCopyRow(
-            value: checksum,
-            onCopy: () => context.copyTextWithToaster(checksum, message: 'Checkphrase copied to clipboard'),
-            textStyle: context.themeText.smallParagraph!.copyWith(color: context.colors.accentPink),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/mobile-app/lib/v2/screens/accounts/open_accounts_management_button.dart b/mobile-app/lib/v2/screens/accounts/open_accounts_management_button.dart
new file mode 100644
index 000000000..965291655
--- /dev/null
+++ b/mobile-app/lib/v2/screens/accounts/open_accounts_management_button.dart
@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:resonance_network_wallet/v2/components/glass_button_base.dart';
+import 'package:resonance_network_wallet/v2/screens/accounts/accounts_sheet.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+
+class OpenAccountsManagementButton extends StatelessWidget {
+  const OpenAccountsManagementButton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final double buttonHeight = 44;
+    final BorderRadius borderRadius = BorderRadius.circular(36);
+    final double iconSize = 20;
+
+    return GestureDetector(
+      onTap: () => showAccountsSheet(context),
+      child: GlassButtonBase(
+        buttonHeight: buttonHeight,
+        borderRadius: borderRadius,
+        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+        child: Row(
+          children: [
+            SvgPicture.asset('assets/v2/uppercase_q.svg', width: iconSize, height: iconSize),
+            const SizedBox(width: 14),
+            RotatedBox(
+              quarterTurns: -1,
+              child: SvgPicture.asset(
+                'assets/v2/caret_left.svg',
+                width: iconSize,
+                height: iconSize,
+                colorFilter: ColorFilter.mode(context.colors.textPrimary, BlendMode.srcIn),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/activity/activity_screen.dart b/mobile-app/lib/v2/screens/activity/activity_screen.dart
index 7c5c84448..a557eae2d 100644
--- a/mobile-app/lib/v2/screens/activity/activity_screen.dart
+++ b/mobile-app/lib/v2/screens/activity/activity_screen.dart
@@ -2,10 +2,13 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/features/components/skeleton.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/providers/active_account_transactions_provider.dart';
-import 'package:resonance_network_wallet/providers/wallet_providers.dart';
+import 'package:resonance_network_wallet/providers/currency_display_provider.dart';
 import 'package:resonance_network_wallet/services/transaction_service.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
@@ -13,81 +16,146 @@ import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
 import 'package:resonance_network_wallet/v2/screens/activity/tx_item.dart';
 import 'package:resonance_network_wallet/v2/screens/activity/transaction_detail_sheet.dart';
 
-class ActivityScreen extends ConsumerWidget {
+class ActivityScreen extends ConsumerStatefulWidget {
   const ActivityScreen({super.key});
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  ConsumerState<ActivityScreen> createState() => _ActivityScreenState();
+}
+
+class _ActivityScreenState extends ConsumerState<ActivityScreen> {
+  TransactionFilter _filterOption = TransactionFilter.all;
+
+  void _onFilterOptionChanged(TransactionFilter option) {
+    if (_filterOption == option) return;
+    setState(() {
+      _filterOption = option;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final colors = context.colors;
     final text = context.themeText;
     final accountAsync = ref.watch(activeAccountProvider);
-    final txAsync = ref.watch(activeAccountTransactionsProvider);
-    final isBalanceHidden = ref.watch(isBalanceHiddenProvider);
+    final txAsync = ref.watch(activeAccountTransactionsProvider(_filterOption));
+    final formatTxAmount = ref.watch(txAmountDisplayProvider);
+
+    final filterButtons = TransactionFilter.values
+        .map(
+          (e) =>
+              _buildFilterButton(e.displayName, onTap: () => _onFilterOptionChanged(e), isSelected: _filterOption == e),
+        )
+        .toList();
 
     return ScaffoldBase(
       appBar: const V2AppBar(title: 'Activity'),
-      child: accountAsync.when(
-        loading: () => Center(child: CircularProgressIndicator(color: colors.textPrimary)),
-        error: (e, _) => Center(
-          child: Text('Error: $e', style: text.detail?.copyWith(color: colors.textError)),
-        ),
-        data: (active) {
-          if (active == null) return const Center(child: Text('No account'));
-          return txAsync.when(
-            loading: () => Center(child: CircularProgressIndicator(color: colors.textPrimary)),
-            error: (e, _) => Center(
-              child: Text('Error: $e', style: text.detail?.copyWith(color: colors.textError)),
-            ),
-            data: (data) {
-              final txService = ref.read(transactionServiceProvider);
-              final all = txService.combineAndDeduplicateTransactions(
-                pendingCancellationIds: data.pendingCancellationIds,
-                pendingTransactions: data.pendingTransactions,
-                scheduledReversibleTransfers: data.scheduledReversibleTransfers,
-                otherTransfers: data.otherTransfers,
-              );
-              if (all.isEmpty) {
-                return Center(
-                  child: Text('No transactions yet', style: text.paragraph?.copyWith(color: colors.textSecondary)),
-                );
-              }
-              final grouped = _groupByDate(all);
-              return ListView.builder(
-                padding: EdgeInsets.zero,
-                itemCount: grouped.length,
-                itemBuilder: (context, i) {
-                  final group = grouped[i];
-                  return Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      if (i > 0) const SizedBox(height: 40),
-                      Text(
-                        group.label,
-                        style: text.paragraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w500),
-                      ),
-                      const SizedBox(height: 8),
-                      ...group.transactions.mapIndexed((index, tx) {
-                        final itemData = TxItemData.from(tx, active.account.accountId);
-                        final isLastItem = index == group.transactions.length - 1;
-                        return buildTxItem(
-                          tx,
-                          itemData,
-                          colors,
-                          text,
-                          isBalanceHidden: isBalanceHidden,
-                          isLastItem: isLastItem,
-                          onTap: () {
-                            showTransactionDetailSheet(context, tx, active.account.accountId);
-                          },
+      mainContent: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.start,
+        children: [
+          SingleChildScrollView(
+            scrollDirection: Axis.horizontal,
+            child: Row(spacing: 12, children: filterButtons),
+          ),
+
+          const SizedBox(height: 40),
+
+          Expanded(
+            child: accountAsync.when(
+              loading: () => const Center(child: Loader()),
+              error: (e, _) => Center(
+                child: Text('Error: $e', style: text.detail?.copyWith(color: colors.textError)),
+              ),
+              data: (active) {
+                if (active == null) return const Center(child: Text('No account'));
+                return txAsync.when(
+                  loading: () => ListView.builder(
+                    itemCount: 3,
+                    itemBuilder: (context, i) => Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        if (i > 0) const SizedBox(height: 32),
+
+                        const Skeleton(width: 100, height: 24),
+                        const SizedBox(height: 12),
+
+                        for (var j = 0; j < 3; j++) ...[
+                          const Skeleton.txItem(),
+                          if (j < 2) Divider(color: colors.txItemSeparator, height: 24),
+                        ],
+                      ],
+                    ),
+                  ),
+                  error: (e, _) => Center(
+                    child: Text('Error: $e', style: text.detail?.copyWith(color: colors.textError)),
+                  ),
+                  data: (data) {
+                    final txService = ref.read(transactionServiceProvider);
+                    final all = txService.combineAndDeduplicateTransactions(
+                      pendingCancellationIds: data.pendingCancellationIds,
+                      pendingTransactions: data.pendingTransactions,
+                      scheduledReversibleTransfers: data.scheduledReversibleTransfers,
+                      otherTransfers: data.otherTransfers,
+                    );
+                    if (all.isEmpty) {
+                      return Center(
+                        child: Text(
+                          'No transactions yet',
+                          style: text.paragraph?.copyWith(color: colors.textSecondary),
+                        ),
+                      );
+                    }
+                    final grouped = _groupByDate(all);
+
+                    return ListView.builder(
+                      padding: EdgeInsets.zero,
+                      itemCount: grouped.length,
+                      itemBuilder: (context, i) {
+                        final group = grouped[i];
+                        return Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            if (i > 0) const SizedBox(height: 32),
+                            Text(group.label, style: text.receiveLabel?.copyWith(color: colors.textTertiary)),
+                            ...group.transactions.mapIndexed((index, tx) {
+                              final itemData = TxItemData.from(tx, active.account.accountId, colors);
+                              final isLastItem = index == group.transactions.length - 1;
+                              return buildTxItem(
+                                tx,
+                                itemData,
+                                colors,
+                                text,
+                                formattedAmount: formatTxAmount(itemData.amount, isSend: itemData.isSend).primaryAmount,
+                                isLastItem: isLastItem,
+                                onTap: () {
+                                  showTransactionDetailSheet(context, tx, active.account.accountId);
+                                },
+                              );
+                            }),
+                          ],
                         );
-                      }),
-                    ],
-                  );
-                },
-              );
-            },
-          );
-        },
+                      },
+                    );
+                  },
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildFilterButton(String label, {bool isSelected = false, required VoidCallback onTap}) {
+    final variant = isSelected ? ButtonVariant.primary : ButtonVariant.outline;
+
+    return IntrinsicWidth(
+      child: QuantusButton.simple(
+        label: label,
+        variant: variant,
+        padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
+        onTap: onTap,
       ),
     );
   }
@@ -104,7 +172,7 @@ class ActivityScreen extends ConsumerWidget {
       labelMap.putIfAbsent(key, () => dateGroupLabel(tx.timestamp));
     }
 
-    return groups.entries.map((e) => _DateGroup(label: labelMap[e.key]!, transactions: e.value)).toList();
+    return groups.entries.map((e) => _DateGroup(label: labelMap[e.key]!.toUpperCase(), transactions: e.value)).toList();
   }
 }
 
diff --git a/mobile-app/lib/v2/screens/activity/transaction_detail_sheet.dart b/mobile-app/lib/v2/screens/activity/transaction_detail_sheet.dart
index 11867f4d5..fbc0a4c8d 100644
--- a/mobile-app/lib/v2/screens/activity/transaction_detail_sheet.dart
+++ b/mobile-app/lib/v2/screens/activity/transaction_detail_sheet.dart
@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
+import 'package:resonance_network_wallet/features/components/dotted_border.dart';
+import 'package:resonance_network_wallet/providers/currency_display_provider.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/shared/extensions/transaction_event_extension.dart';
+import 'package:resonance_network_wallet/v2/components/amount_display_with_conversion.dart';
 import 'package:resonance_network_wallet/v2/components/bottom_sheet_container.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/components/glass_icon_button.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -17,36 +18,30 @@ void showTransactionDetailSheet(BuildContext context, TransactionEvent tx, Strin
   );
 }
 
-class _TransactionDetailSheet extends StatefulWidget {
+class _TransactionDetailSheet extends StatelessWidget {
   final TransactionEvent tx;
   final String activeAccountId;
-  const _TransactionDetailSheet({required this.tx, required this.activeAccountId});
-
-  @override
-  State<_TransactionDetailSheet> createState() => _TransactionDetailSheetState();
-}
 
-class _TransactionDetailSheetState extends State<_TransactionDetailSheet> {
-  final _checksumService = HumanReadableChecksumService();
-  String? _checkphrase;
-
-  bool get _isSend => widget.tx.from == widget.activeAccountId;
-  String get _counterparty => _isSend ? widget.tx.to : widget.tx.from;
+  const _TransactionDetailSheet({required this.tx, required this.activeAccountId});
 
-  bool get _isPending => widget.tx is PendingTransactionEvent;
+  bool get _isSend => tx.from == activeAccountId;
+  bool get _isPending => tx is PendingTransactionEvent;
 
   String get _title {
     if (_isPending) return 'Sending';
-    if (widget.tx.isReversibleScheduled) return _isSend ? 'Pending' : 'Receiving';
+    if (tx.isReversibleScheduled) return _isSend ? 'Scheduled' : 'Receiving';
     return _isSend ? 'Sent' : 'Received';
   }
 
-  @override
-  void initState() {
-    super.initState();
-    _checksumService.getHumanReadableName(_counterparty).then((name) {
-      if (mounted) setState(() => _checkphrase = name);
-    });
+  String get _statusLabel {
+    if (_isPending) return 'In Process';
+    if (tx.isReversibleScheduled) return 'Scheduled';
+    return 'Completed';
+  }
+
+  Color _statusColor(AppColorsV2 colors) {
+    if (_isPending || tx.isReversibleScheduled) return colors.checksum;
+    return colors.success;
   }
 
   @override
@@ -58,145 +53,158 @@ class _TransactionDetailSheetState extends State<_TransactionDetailSheet> {
       title: _title,
       child: Column(
         mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
-          const SizedBox(height: 40),
-          _amountCard(colors, text),
-          const SizedBox(height: 40),
-          _addressSection(colors, text),
-          _feeRow(colors, text),
-          const SizedBox(height: 32),
-          _explorerButton(colors, text),
+          const SizedBox(height: 16),
+          _AmountSection(tx: tx, isSend: _isSend, colors: colors),
+          const SizedBox(height: 20),
+          _DetailRow(label: 'STATUS', value: _statusLabel, valueColor: _statusColor(colors), colors: colors),
+          const SizedBox(height: 8),
+          DottedBorder(
+            dashLength: 3,
+            gapLength: 8,
+            color: colors.borderButton.useOpacity(0.5),
+            child: const SizedBox(width: double.infinity, height: 1),
+          ),
+          const SizedBox(height: 8),
+          _DetailsSection(tx: tx, isSend: _isSend, colors: colors),
+          const SizedBox(height: 24),
+          Center(
+            child: _ExplorerLink(tx: tx, colors: colors, text: text),
+          ),
+          const SizedBox(height: 8),
         ],
       ),
     );
   }
+}
 
-  Widget _amountCard(AppColorsV2 colors, AppTextTheme text) {
-    final fmt = NumberFormattingService();
-    final amount = fmt.formatBalance(widget.tx.amount);
-    final date = DateFormat('MMM d, yyyy').format(widget.tx.timestamp);
-    final time = DateFormat('h:mm a').format(widget.tx.timestamp);
+class _AmountSection extends ConsumerWidget {
+  final TransactionEvent tx;
+  final bool isSend;
+  final AppColorsV2 colors;
 
-    return Container(
-      width: double.infinity,
-      padding: const EdgeInsets.all(20),
-      decoration: BoxDecoration(color: Colors.white.withValues(alpha: 0.1), borderRadius: BorderRadius.circular(14)),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            '$amount ${AppConstants.tokenSymbol}',
-            style: text.smallTitle?.copyWith(color: colors.textPrimary, fontSize: 32, fontWeight: FontWeight.w600),
-          ),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.end,
-            children: [
-              Text(
-                date,
-                style: text.smallParagraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w500),
-              ),
-              const SizedBox(height: 8),
-              Text('At $time', style: text.detail?.copyWith(color: Colors.white.withValues(alpha: 0.5))),
-            ],
-          ),
-        ],
-      ),
+  const _AmountSection({required this.tx, required this.isSend, required this.colors});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final amount = ref.watch(txAmountDisplayProvider)(
+      tx.amount,
+      isSend: isSend,
+      withQuanSymbol: false,
+      customHiddenText: '-----',
     );
+
+    return AmountDisplayWithConversion(amountDisplay: amount, colorizeAmount: !isSend);
   }
+}
+
+class _DetailsSection extends ConsumerWidget {
+  final TransactionEvent tx;
+  final bool isSend;
+  final AppColorsV2 colors;
+
+  const _DetailsSection({required this.tx, required this.isSend, required this.colors});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final formattingService = ref.watch(numberFormattingServiceProvider);
+
+    final counterparty = isSend ? tx.to : tx.from;
+    final address = AddressFormattingService.formatAddress(counterparty, prefix: 7, ellipses: '.......', postFix: 6);
+    final dateTime = DatetimeFormattingService.formatTxDateTime(tx.timestamp);
+
+    BigInt? fee;
+    if (tx is TransferEvent) fee = (tx as TransferEvent).fee;
+    if (tx is PendingTransactionEvent) fee = (tx as PendingTransactionEvent).fee;
+    final feeStr = (fee != null && fee != BigInt.zero)
+        ? '${formattingService.formatBalance(fee, maxDecimals: AppConstants.decimals)} ${AppConstants.tokenSymbol}'
+        : null;
 
-  Widget _addressSection(AppColorsV2 colors, AppTextTheme text) {
-    final direction = _isSend ? 'To:' : 'From:';
-    final address = AddressFormattingService.formatAddress(_counterparty, prefix: 15, ellipses: '.......', postFix: 14);
+    final txHash = tx.extrinsicHash != null
+        ? AddressFormattingService.formatAddress(tx.extrinsicHash!, prefix: 6, ellipses: '...', postFix: 4)
+        : null;
 
     return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(
-          direction,
-          style: text.paragraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w600),
-        ),
-        const SizedBox(height: 12),
-        Row(
-          children: [
-            Expanded(
-              child: Text(
-                address,
-                style: text.smallParagraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w500),
-                overflow: TextOverflow.ellipsis,
-              ),
-            ),
-            const SizedBox(width: 8),
-            _copyButton(colors, value: _counterparty),
-          ],
-        ),
-        if (_checkphrase != null) ...[
-          const SizedBox(height: 4),
-          Row(
-            children: [
-              Expanded(
-                child: Text(_checkphrase!, style: text.smallParagraph?.copyWith(color: colors.accentPink)),
-              ),
-              const SizedBox(width: 8),
-              _copyButton(colors, value: _checkphrase!, message: 'Checkphrase copied to clipboard'),
-            ],
-          ),
-        ],
-        const SizedBox(height: 24),
+        _DetailRow(label: isSend ? 'TO' : 'FROM', value: address, colors: colors),
+        _DetailRow(label: 'DATE', value: dateTime, colors: colors),
+        if (feeStr != null) _DetailRow(label: 'NETWORK FEE', value: feeStr, colors: colors),
+        if (txHash != null) _DetailRow(label: 'TX HASH', value: txHash, colors: colors),
       ],
     );
   }
+}
 
-  Widget _copyButton(AppColorsV2 colors, {required String value, String message = 'Address copied to clipboard'}) {
-    return GlassIconButton.rounded(
-      icon: Icons.copy,
-      onTap: () => context.copyTextWithToaster(value, message: message),
-      size: IconButtonSize.small,
-    );
-  }
+class _DetailRow extends StatelessWidget {
+  final String label;
+  final String value;
+  final Color? valueColor;
+  final AppColorsV2 colors;
 
-  Widget _feeRow(AppColorsV2 colors, AppTextTheme text) {
-    BigInt? fee;
-    if (widget.tx is TransferEvent) fee = (widget.tx as TransferEvent).fee;
-    if (widget.tx is PendingTransactionEvent) fee = (widget.tx as PendingTransactionEvent).fee;
-    if (fee == null || fee == BigInt.zero) return const SizedBox.shrink();
-    final fmt = NumberFormattingService();
-    final feeStr = '${fmt.formatBalance(fee, maxDecimals: 8)} ${AppConstants.tokenSymbol}';
-    final style = text.detail?.copyWith(color: Colors.white.withValues(alpha: 0.5));
-
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 24),
+  const _DetailRow({required this.label, required this.value, required this.colors, this.valueColor});
+
+  @override
+  Widget build(BuildContext context) {
+    final text = context.themeText;
+
+    return Container(
+      padding: const EdgeInsets.symmetric(vertical: 8),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          Text('Network Fee:', style: style),
-          Text(feeStr, style: style),
+          Text(label, style: text.transactionDetailRowLabel?.copyWith(color: colors.textTertiary)),
+          Text(
+            value,
+            style: text.transactionDetailRowValue?.copyWith(color: valueColor ?? Colors.white.withValues(alpha: 0.8)),
+          ),
         ],
       ),
     );
   }
+}
+
+class _ExplorerLink extends StatelessWidget {
+  final TransactionEvent tx;
+  final AppColorsV2 colors;
+  final AppTextTheme text;
 
-  Widget _explorerButton(AppColorsV2 colors, AppTextTheme text) {
-    final isPending = widget.tx is PendingTransactionEvent;
-    final color = isPending ? colors.textPrimary.withValues(alpha: 0.3) : colors.textPrimary;
+  const _ExplorerLink({required this.tx, required this.colors, required this.text});
 
-    return GlassButton.simple(
-      label: 'View in Explorer',
-      onTap: _openExplorer,
-      isDisabled: isPending,
-      variant: ButtonVariant.secondary,
-      icon: Icon(Icons.open_in_new, size: 16, color: color),
+  @override
+  Widget build(BuildContext context) {
+    final isPending = tx is PendingTransactionEvent;
+    final color = isPending ? colors.accentOrange.withValues(alpha: 0.3) : colors.accentOrange;
+
+    return GestureDetector(
+      onTap: isPending ? null : () => _openExplorer(),
+      child: Container(
+        padding: const EdgeInsets.only(bottom: 2),
+        decoration: BoxDecoration(
+          border: Border(bottom: BorderSide(color: color, width: 1)),
+        ),
+        child: Text(
+          'View in Explorer ↗',
+          style: text.smallParagraph?.copyWith(color: color, fontWeight: FontWeight.w400),
+        ),
+      ),
     );
   }
 
   void _openExplorer() {
-    final tx = widget.tx;
     final isMinerReward = tx.isMinerReward;
-    final transactionType = isMinerReward
-        ? 'miner-rewards'
-        : (tx.isReversibleScheduled || tx.isReversibleExecuted || tx.isReversibleCancelled)
-        ? 'reversible-transactions'
-        : 'immediate-transactions';
+    String transactionType;
+    if (isMinerReward) {
+      transactionType = 'miner-rewards';
+    } else if (tx.isReversibleScheduled) {
+      transactionType = 'scheduled-reversible-transactions';
+    } else if (tx.isReversibleExecuted) {
+      transactionType = 'executed-reversible-transactions';
+    } else if (tx.isReversibleCancelled) {
+      transactionType = 'cancelled-reversible-transactions';
+    } else {
+      transactionType = 'immediate-transactions';
+    }
 
     String? path;
     if (tx.extrinsicHash != null) {
@@ -204,6 +212,7 @@ class _TransactionDetailSheetState extends State<_TransactionDetailSheet> {
     } else if (isMinerReward && tx.blockHash != null) {
       path = '$transactionType/${tx.blockHash}';
     }
+
     if (path != null) launchUrl(Uri.parse('${AppConstants.explorerEndpoint}/$path'));
   }
 }
diff --git a/mobile-app/lib/v2/screens/activity/tx_item.dart b/mobile-app/lib/v2/screens/activity/tx_item.dart
index ef01c6fed..b88735f7a 100644
--- a/mobile-app/lib/v2/screens/activity/tx_item.dart
+++ b/mobile-app/lib/v2/screens/activity/tx_item.dart
@@ -9,8 +9,11 @@ class TxItemData {
   final String timeLabel;
   final Color iconBg;
   final Color iconColor;
+  final Color labelColor;
+  final Color amountColor;
+  final Color borderColor;
   final bool isSend;
-  final String amount;
+  final BigInt amount;
   final String counterpartyAddr;
 
   const TxItemData({
@@ -18,44 +21,114 @@ class TxItemData {
     required this.timeLabel,
     required this.iconBg,
     required this.iconColor,
+    required this.labelColor,
+    required this.amountColor,
+    required this.borderColor,
     required this.isSend,
     required this.amount,
     required this.counterpartyAddr,
   });
 
-  factory TxItemData.from(TransactionEvent tx, String accountId) {
+  factory TxItemData.from(TransactionEvent tx, String accountId, AppColorsV2 colors) {
     final isSend = tx.from == accountId;
     final isPending = tx is PendingTransactionEvent;
     final isScheduled = tx.isReversibleScheduled;
     final isHighlighted = isPending || isScheduled;
-    final fmt = NumberFormattingService();
+
+    String getLabel() {
+      if (isPending && isSend) {
+        return 'Sending';
+      }
+      if (isPending && !isSend) {
+        return 'Receiving';
+      }
+      if (isScheduled && isSend) {
+        return 'Pending';
+      }
+      if (isScheduled && !isSend) {
+        return 'Receiving';
+      }
+      if (isSend && !isScheduled) {
+        return 'Sent';
+      }
+
+      return 'Received';
+    }
+
+    String getTimeLabel() {
+      if (isPending) {
+        return 'now';
+      }
+      if (isScheduled) {
+        return _formatDuration(tx.timeRemaining);
+      }
+      return _timeAgo(tx.timestamp);
+    }
+
+    Color getIconBg() {
+      if (isHighlighted && !isSend) {
+        return colors.txItemIncomingHighlightBg;
+      }
+      if (isHighlighted && isSend) {
+        return colors.txItemOutgoingHighlightBg;
+      }
+      return Colors.transparent;
+    }
+
+    Color getIconColor() {
+      if (isHighlighted && !isSend) {
+        return colors.success;
+      }
+      if (isHighlighted && isSend) {
+        return colors.checksum;
+      }
+      return colors.txItemIconDefault;
+    }
+
+    Color getLabelColor() {
+      if (isHighlighted && !isSend) {
+        return colors.success;
+      }
+      if (isHighlighted && isSend) {
+        return colors.checksum;
+      }
+
+      return colors.textPrimary;
+    }
+
+    Color getAmountColor() {
+      if (!isSend) {
+        return colors.success;
+      }
+
+      if (isHighlighted && isSend) {
+        return colors.checksum;
+      }
+
+      return colors.textPrimary;
+    }
+
+    Color getBorderColor() {
+      if (isHighlighted && !isSend) {
+        return colors.txItemIncomingHighlightBorder;
+      }
+      if (isHighlighted && isSend) {
+        return colors.txItemOutgoingHighlightBorder;
+      }
+      return colors.txItemBorderDefault;
+    }
 
     return TxItemData(
-      label: isPending
-          ? (isSend ? 'Sending' : 'Receiving')
-          : isScheduled
-          ? (isSend ? 'Pending' : 'Receiving')
-          : isSend
-          ? 'Sent'
-          : 'Received',
-      timeLabel: isPending
-          ? 'now'
-          : isScheduled
-          ? _formatDuration(tx.timeRemaining)
-          : _timeAgo(tx.timestamp),
-      iconBg: isHighlighted && !isSend
-          ? const Color(0x2927F027)
-          : isHighlighted && isSend
-          ? const Color(0x29FFBC42)
-          : const Color(0xFF292929),
-      iconColor: isHighlighted && !isSend
-          ? const Color(0xFF27F027)
-          : isHighlighted && isSend
-          ? const Color(0xFFFFBC42)
-          : const Color(0x80FFFFFF),
+      label: getLabel(),
+      timeLabel: getTimeLabel(),
+      iconBg: getIconBg(),
+      iconColor: getIconColor(),
+      labelColor: getLabelColor(),
+      amountColor: getAmountColor(),
+      borderColor: getBorderColor(),
       isSend: isSend,
-      amount: '${fmt.formatBalance(tx.amount)} ${AppConstants.tokenSymbol}',
-      counterpartyAddr: _shortenAddress(isSend ? tx.to : tx.from),
+      amount: tx.amount,
+      counterpartyAddr: AddressFormattingService.formatAddress(isSend ? tx.to : tx.from, prefix: 5, postFix: 3),
     );
   }
 }
@@ -65,7 +138,7 @@ Widget buildTxItem(
   TxItemData data,
   AppColorsV2 colors,
   AppTextTheme text, {
-  required bool isBalanceHidden,
+  required String formattedAmount,
   required bool isLastItem,
   VoidCallback? onTap,
 }) {
@@ -79,9 +152,13 @@ Widget buildTxItem(
           child: Row(
             children: [
               Container(
-                width: 32,
-                height: 32,
-                decoration: BoxDecoration(color: data.iconBg, borderRadius: BorderRadius.circular(6)),
+                width: 36,
+                height: 36,
+                decoration: BoxDecoration(
+                  color: data.iconBg,
+                  borderRadius: BorderRadius.circular(6),
+                  border: Border.all(color: data.borderColor, width: 1.5),
+                ),
                 child: Transform.rotate(
                   angle: data.isSend ? 3.14159 : 0,
                   child: Icon(Icons.arrow_downward_rounded, size: 16, color: data.iconColor),
@@ -92,28 +169,30 @@ Widget buildTxItem(
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    Text(data.label, style: text.smallParagraph?.copyWith(color: colors.textPrimary)),
+                    Text(data.label, style: text.paragraph?.copyWith(color: data.labelColor)),
                     const SizedBox(height: 2),
                     Text(data.timeLabel, style: text.detail?.copyWith(color: colors.textTertiary)),
                   ],
                 ),
               ),
-              if (!isBalanceHidden)
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.end,
-                  children: [
-                    Text(data.amount, style: text.smallParagraph?.copyWith(color: colors.textPrimary)),
-                    const SizedBox(height: 2),
-                    Text(
-                      '${data.isSend ? "To" : "From"}: ${data.counterpartyAddr}',
-                      style: text.detail?.copyWith(color: colors.textTertiary),
+
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.end,
+                children: [
+                  Text(
+                    formattedAmount,
+                    style: text.paragraph?.copyWith(
+                      color: data.amountColor,
+                      fontFamily: AppTextTheme.fontFamilySecondary,
                     ),
-                  ],
-                )
-              else
-                Center(
-                  child: Text('--------', style: text.smallParagraph?.copyWith(color: colors.textPrimary)),
-                ),
+                  ),
+                  const SizedBox(height: 2),
+                  Text(
+                    '${data.isSend ? "To" : "From"}: ${data.counterpartyAddr}',
+                    style: text.detail?.copyWith(color: colors.textTertiary),
+                  ),
+                ],
+              ),
             ],
           ),
         ),
@@ -123,11 +202,6 @@ Widget buildTxItem(
   );
 }
 
-String _shortenAddress(String addr) {
-  if (addr.length <= 10) return addr;
-  return '${addr.substring(0, 5)}...${addr.substring(addr.length - 3)}';
-}
-
 String _formatDuration(Duration d) {
   final days = d.inDays;
   final hours = d.inHours % 24;
diff --git a/mobile-app/lib/v2/screens/auth/auth_wrapper.dart b/mobile-app/lib/v2/screens/auth/auth_wrapper.dart
index 0985946ca..3530efb0e 100644
--- a/mobile-app/lib/v2/screens/auth/auth_wrapper.dart
+++ b/mobile-app/lib/v2/screens/auth/auth_wrapper.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:resonance_network_wallet/providers/local_auth_provider.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/components/gradient_background.dart';
+import 'package:resonance_network_wallet/v2/components/base_background.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 import 'package:resonance_network_wallet/v2/theme/app_spacing.dart';
 import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
@@ -28,14 +29,14 @@ class AuthWrapper extends ConsumerWidget {
   Widget _buildPrivacyOverlay(BuildContext context) {
     return Scaffold(
       backgroundColor: context.colors.background,
-      body: GradientBackground(child: Center(child: Image.asset('assets/v2/auth_wrapper_bracket.png'))),
+      body: BaseBackground(child: Center(child: Image.asset('assets/v2/auth_wrapper_bracket.png'))),
     );
   }
 
   Widget _buildLockScreen(BuildContext context, WidgetRef ref, bool isAuthenticating) {
     return Scaffold(
       backgroundColor: context.colors.background,
-      body: GradientBackground(
+      body: BaseBackground(
         child: Center(
           child: Column(
             mainAxisSize: MainAxisSize.min,
@@ -49,11 +50,11 @@ class AuthWrapper extends ConsumerWidget {
               ),
               const SizedBox(height: 60),
               if (isAuthenticating)
-                const CircularProgressIndicator()
+                const Loader()
               else
                 Padding(
                   padding: EdgeInsets.symmetric(horizontal: context.themeSize.screenPadding),
-                  child: GlassButton.simple(
+                  child: QuantusButton.simple(
                     label: 'Unlock Wallet',
                     onTap: () {
                       ref.read(localAuthProvider.notifier).authenticate();
diff --git a/mobile-app/lib/v2/screens/create/new_wallet_recovery_phrase_screen.dart b/mobile-app/lib/v2/screens/create/new_wallet_recovery_phrase_screen.dart
new file mode 100644
index 000000000..c05cb6e4e
--- /dev/null
+++ b/mobile-app/lib/v2/screens/create/new_wallet_recovery_phrase_screen.dart
@@ -0,0 +1,118 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/providers/remote_config_provider.dart';
+import 'package:resonance_network_wallet/services/firebase_messaging_service.dart';
+import 'package:resonance_network_wallet/services/wallet_creation_service.dart';
+import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
+import 'package:resonance_network_wallet/v2/components/recovery_phrase_body.dart';
+import 'package:resonance_network_wallet/v2/screens/accounts/account_ready_screen.dart';
+
+class NewWalletRecoveryPhraseScreen extends ConsumerStatefulWidget {
+  const NewWalletRecoveryPhraseScreen({super.key});
+
+  @override
+  ConsumerState<NewWalletRecoveryPhraseScreen> createState() => _NewWalletRecoveryPhraseScreenState();
+}
+
+class _NewWalletRecoveryPhraseScreenState extends ConsumerState<NewWalletRecoveryPhraseScreen> {
+  final WalletCreationService _walletCreationService = WalletCreationService();
+  final HdWalletService _hdWalletService = HdWalletService();
+
+  final String _accountName = 'Account 1';
+  final int _walletIndex = 0;
+  List<String> _words = [];
+  String _mnemonic = '';
+  bool _isLoading = true;
+  bool _isSubmitting = false;
+  bool _errorOccurred = false;
+
+  late String _address;
+  late String _checksum;
+
+  Future<void> _generateMnemonic() async {
+    if (!mounted) return;
+    setState(() => _isLoading = true);
+
+    try {
+      _mnemonic = await SubstrateService().generateMnemonic();
+      if (_mnemonic.isEmpty) throw Exception('Mnemonic generation returned empty.');
+
+      _words = _mnemonic.split(' ');
+      _address = _hdWalletService.keyPairAtIndex(_mnemonic, 0).ss58Address;
+      _checksum = await HumanReadableChecksumService().getHumanReadableName(_address);
+
+      if (mounted) setState(() => _isLoading = false);
+    } catch (e) {
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+          _errorOccurred = true;
+        });
+
+        context.showErrorToaster(message: 'Failed to generate: $e');
+      }
+    }
+  }
+
+  Future<void> _continue() async {
+    if (_words.isEmpty) return;
+
+    setState(() => _isSubmitting = true);
+    try {
+      final accounts = ref.read(accountsProvider).value ?? <Account>[];
+      await _walletCreationService.createNewWallet(
+        name: _accountName,
+        mnemonic: _mnemonic,
+        walletIndex: _walletIndex,
+        accountId: _address,
+        existingAccounts: accounts,
+      );
+
+      ref.invalidate(accountsProvider);
+      ref.invalidate(activeAccountProvider);
+
+      if (ref.read(remoteConfigProvider).enableRemoteNotifications) {
+        ref.read(firebaseMessagingServiceProvider).registerDeviceIfPossible();
+      }
+
+      if (!mounted) return;
+      Navigator.pushAndRemoveUntil(
+        context,
+        MaterialPageRoute(
+          builder: (_) => AccountReadyScreen(
+            accountId: _address,
+            accountName: _accountName,
+            checksumPhrase: _checksum,
+            origin: AccountReadyOverviewOrigin.walletCreated,
+          ),
+        ),
+        (route) => false,
+      );
+    } catch (e) {
+      if (mounted) context.showErrorToaster(message: 'Error saving wallet: $e');
+    } finally {
+      if (mounted) setState(() => _isSubmitting = false);
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _generateMnemonic();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return RecoveryPhraseBody(
+      appBarTitle: 'Create Wallet',
+      words: _words,
+      primaryButtonLabel: 'Next',
+      onPrimary: _continue,
+      isGridLoading: _isLoading,
+      isPrimaryButtonDisabled: _errorOccurred,
+      isPrimaryButtonLoading: _isLoading || _isSubmitting,
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/create/recovery_phrase_sheet.dart b/mobile-app/lib/v2/screens/create/recovery_phrase_sheet.dart
deleted file mode 100644
index eaee56e85..000000000
--- a/mobile-app/lib/v2/screens/create/recovery_phrase_sheet.dart
+++ /dev/null
@@ -1,56 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:resonance_network_wallet/features/components/mnemonic_grid.dart';
-import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
-import 'package:resonance_network_wallet/v2/components/bottom_sheet_container.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
-
-class RecoveryPhraseSheet extends StatelessWidget {
-  final List<String> words;
-  final bool isLoading;
-  final String? error;
-  final String mnemonic;
-
-  const RecoveryPhraseSheet({
-    super.key,
-    required this.words,
-    required this.isLoading,
-    required this.error,
-    required this.mnemonic,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return BottomSheetContainer(
-      title: 'Backup Your Wallet',
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Text(
-            'Write down your 24-word recovery phrase and store it somewhere safe. This is the ONLY way to recover your wallet.',
-            style: context.themeText.smallParagraph,
-            textAlign: TextAlign.center,
-          ),
-          const SizedBox(height: 16),
-          MnemonicGrid(words: words, isRevealed: true),
-          const SizedBox(height: 16),
-          GlassButton.simple(
-            padding: const EdgeInsets.all(0),
-            label: 'Copy to clipboard',
-            icon: Icon(Icons.copy, color: context.colors.textPrimary, size: 14),
-            onTap: () => context.copyTextWithToaster(mnemonic, message: 'Recovery phrase copied to clipboard'),
-            variant: ButtonVariant.transparent,
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-void showRecoveryPhraseSheet(BuildContext context, List<String> words, bool isLoading, String? error, String mnemonic) {
-  BottomSheetContainer.show(
-    context,
-    builder: (_) => RecoveryPhraseSheet(words: words, isLoading: isLoading, error: error, mnemonic: mnemonic),
-  );
-}
diff --git a/mobile-app/lib/v2/screens/create/wallet_ready_screen.dart b/mobile-app/lib/v2/screens/create/wallet_ready_screen.dart
index e14cd4363..25ce1e681 100644
--- a/mobile-app/lib/v2/screens/create/wallet_ready_screen.dart
+++ b/mobile-app/lib/v2/screens/create/wallet_ready_screen.dart
@@ -1,303 +1,32 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/providers/account_providers.dart';
-import 'package:resonance_network_wallet/providers/remote_config_provider.dart';
-import 'package:resonance_network_wallet/services/firebase_messaging_service.dart';
-import 'package:resonance_network_wallet/services/referral_service.dart';
-import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
-import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/components/glass_icon_button.dart';
-import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
-import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
-import 'package:resonance_network_wallet/v2/screens/create/recovery_phrase_sheet.dart';
-import 'package:resonance_network_wallet/v2/screens/home/home_screen.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+import 'package:resonance_network_wallet/v2/screens/create/new_wallet_recovery_phrase_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_caution_scaffold.dart';
 
 class WalletReadyScreenV2 extends ConsumerStatefulWidget {
-  const WalletReadyScreenV2({super.key, this.walletIndex = 0});
-
-  final int walletIndex;
+  const WalletReadyScreenV2({super.key});
 
   @override
   ConsumerState<WalletReadyScreenV2> createState() => _WalletReadyScreenV2State();
 }
 
 class _WalletReadyScreenV2State extends ConsumerState<WalletReadyScreenV2> {
-  String _mnemonic = '';
-  bool _isLoading = true;
-  bool _isSubmitting = false;
-  String? _error;
-
-  final SettingsService _settingsService = SettingsService();
-  final AccountsService _accountsService = AccountsService();
-  final HdWalletService _hdWalletService = HdWalletService();
-  final ReferralService _referralService = ReferralService();
-
-  final _accountName = TextEditingController();
-  final FocusNode _accountNameFocus = FocusNode();
-  String? _accountNameError;
-  bool _isEditingName = false;
-
-  late String _address;
-  late String _checksum;
-
-  @override
-  void initState() {
-    super.initState();
-    _accountName.text = 'Account 1';
-    _generateMnemonic();
-  }
-
-  Future<void> _generateMnemonic() async {
-    if (!mounted) return;
-    setState(() => _isLoading = true);
+  bool _acknowledged = false;
 
-    try {
-      _mnemonic = await SubstrateService().generateMnemonic();
-      if (_mnemonic.isEmpty) throw Exception('Mnemonic generation returned empty.');
-
-      _address = _hdWalletService.keyPairAtIndex(_mnemonic, 0).ss58Address;
-      _checksum = await HumanReadableChecksumService().getHumanReadableName(_address);
-
-      if (mounted) setState(() => _isLoading = false);
-    } catch (e) {
-      if (mounted) {
-        setState(() {
-          _isLoading = false;
-          _error = 'Failed to generate: $e';
-        });
-      }
-    }
-  }
-
-  void _toggleEditName() {
-    setState(() {
-      _isEditingName = !_isEditingName;
-      if (_isEditingName) {
-        _accountNameError = null;
-      } else {
-        final v = _accountName.text.trim();
-        if (v.isEmpty) {
-          _accountNameError = "Name can't be empty";
-          _isEditingName = true;
-        }
-      }
-    });
-    if (_isEditingName) {
-      WidgetsBinding.instance.addPostFrameCallback((_) => _accountNameFocus.requestFocus());
-    } else {
-      _accountNameFocus.unfocus();
-    }
-  }
-
-  @override
-  void dispose() {
-    _accountName.dispose();
-    _accountNameFocus.dispose();
-    super.dispose();
-  }
-
-  Future<void> _continue() async {
-    if (_mnemonic.isEmpty || _accountNameError != null) return;
-
-    setState(() => _isSubmitting = true);
-    try {
-      await _settingsService.setMnemonic(_mnemonic, widget.walletIndex);
-
-      final accounts = ref.read(accountsProvider).value ?? <Account>[];
-      final hasRoot = accounts.any((a) => a.walletIndex == widget.walletIndex && a.index == 0);
-      if (!hasRoot) {
-        await _accountsService.addAccount(
-          Account(walletIndex: widget.walletIndex, index: 0, name: _accountName.text.trim(), accountId: _address),
-        );
-        try {
-          _referralService.submitAddressToBackend();
-        } catch (_) {}
-      }
-      ref.invalidate(accountsProvider);
-      ref.invalidate(activeAccountProvider);
-
-      if (ref.read(remoteConfigProvider).enableRemoteNotifications) {
-        ref.read(firebaseMessagingServiceProvider).registerDeviceIfPossible();
-      }
-
-      if (!mounted) return;
-      Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (_) => const HomeScreen()), (route) => false);
-    } catch (e) {
-      if (mounted) context.showErrorToaster(message: 'Error saving wallet: $e');
-    } finally {
-      if (mounted) setState(() => _isSubmitting = false);
-    }
+  void _continue() {
+    Navigator.push(context, MaterialPageRoute(builder: (_) => const NewWalletRecoveryPhraseScreen()));
   }
 
   @override
   Widget build(BuildContext context) {
-    final colors = context.colors;
-    final text = context.themeText;
-    final canContinue = !_isLoading && _error == null && _accountNameError == null;
-
-    return ScaffoldBase(
-      appBar: V2AppBar(
-        title: 'Your Wallet Is Ready',
-        trailing: GestureDetector(
-          onTap: () => Navigator.pop(context),
-          child: Icon(Icons.close, color: colors.textPrimary, size: 24),
-        ),
-      ),
-      child: Column(
-        children: [
-          Expanded(
-            child: SingleChildScrollView(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  _Field(
-                    label: 'Wallet Name',
-                    isLoading: _isLoading,
-                    actionIcon: _isEditingName ? Icons.check : Icons.edit_outlined,
-                    onAction: _toggleEditName,
-                    child: TextField(
-                      controller: _accountName,
-                      focusNode: _accountNameFocus,
-                      readOnly: !_isEditingName,
-                      style: text.smallParagraph?.copyWith(color: colors.textPrimary),
-                      cursorColor: colors.textPrimary,
-                      decoration: const InputDecoration(
-                        filled: true,
-                        fillColor: Colors.transparent,
-                        border: InputBorder.none,
-                        enabledBorder: InputBorder.none,
-                        focusedBorder: InputBorder.none,
-                        disabledBorder: InputBorder.none,
-                        isDense: true,
-                        contentPadding: EdgeInsets.zero,
-                      ),
-                      onTap: () {
-                        if (!_isEditingName) _toggleEditName();
-                      },
-                      onSubmitted: (_) {
-                        if (_isEditingName) _toggleEditName();
-                      },
-                    ),
-                  ),
-                  if (_accountNameError != null) ...[
-                    const SizedBox(height: 6),
-                    Text(_accountNameError!, style: text.detail?.copyWith(color: colors.accentPink)),
-                  ],
-                  const SizedBox(height: 24),
-                  _Field(
-                    label: 'Wallet Address',
-                    value: _isLoading
-                        ? '...'
-                        : AddressFormattingService.formatAddress(
-                            _address,
-                            prefix: 15,
-                            ellipses: '.......',
-                            postFix: 14,
-                          ),
-                    isLoading: _isLoading,
-                    actionIcon: Icons.copy_outlined,
-                    onAction: () => context.copyTextWithToaster(_address),
-                  ),
-                  const SizedBox(height: 24),
-                  _Field(
-                    label: 'Wallet Checkphrase',
-                    value: _isLoading ? '...' : _checksum,
-                    isLoading: _isLoading,
-                    valueColor: colors.accentPink,
-                    actionIcon: Icons.copy_outlined,
-                    onAction: () => context.copyTextWithToaster(_checksum, message: 'Checkphrase copied'),
-                  ),
-                  const SizedBox(height: 16),
-                  GestureDetector(
-                    onTap: () {
-                      final words = _mnemonic.isNotEmpty ? _mnemonic.split(' ') : <String>[];
-                      showRecoveryPhraseSheet(context, words, _isLoading, _error, _mnemonic);
-                    },
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        Icon(Icons.visibility_outlined, size: 16, color: colors.textSecondary),
-                        const SizedBox(width: 8),
-                        Text('View recovery phrase', style: text.detail?.copyWith(color: colors.textSecondary)),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(height: 32),
-                ],
-              ),
-            ),
-          ),
-          const SizedBox(height: 24),
-          GlassButton.simple(
-            label: 'Continue',
-            onTap: _continue,
-            isLoading: _isSubmitting,
-            variant: ButtonVariant.secondary,
-            isDisabled: !canContinue,
-          ),
-          const SizedBox(height: 24),
-        ],
-      ),
-    );
-  }
-}
-
-class _Field extends StatelessWidget {
-  final String label;
-  final String? value;
-  final Widget? child;
-  final bool isLoading;
-  final Color? valueColor;
-  final IconData actionIcon;
-  final VoidCallback onAction;
-
-  const _Field({
-    required this.label,
-    this.value,
-    this.child,
-    required this.isLoading,
-    this.valueColor,
-    required this.actionIcon,
-    required this.onAction,
-  }) : assert(value != null || child != null, 'Provide value or child');
-
-  @override
-  Widget build(BuildContext context) {
-    final colors = context.colors;
-    final text = context.themeText;
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(label, style: text.smallParagraph?.copyWith(color: colors.textPrimary)),
-        const SizedBox(height: 12),
-        Container(
-          padding: const EdgeInsets.only(left: 12, right: 8, top: 8, bottom: 8),
-          decoration: BoxDecoration(color: Colors.white.withValues(alpha: 0.1), borderRadius: BorderRadius.circular(8)),
-          child: Row(
-            children: [
-              Expanded(
-                child:
-                    child ??
-                    Text(
-                      value!,
-                      style: text.smallParagraph?.copyWith(color: valueColor ?? colors.textPrimary),
-                      overflow: TextOverflow.ellipsis,
-                    ),
-              ),
-              SizedBox(
-                width: 40,
-                height: 40,
-                child: GlassIconButton.rounded(radius: 8, icon: actionIcon, onTap: isLoading ? null : onAction),
-              ),
-            ],
-          ),
-        ),
-      ],
+    final data = const SettingsCautionScaffoldData.recoveryPhrase();
+
+    return SettingsCautionScaffold(
+      appBarTitle: 'Create Wallet',
+      data: data,
+      checkboxChecked: _acknowledged,
+      onCheckboxChanged: () => setState(() => _acknowledged = !_acknowledged),
+      onContinue: _continue,
     );
   }
 }
diff --git a/mobile-app/lib/v2/screens/home/activity_section.dart b/mobile-app/lib/v2/screens/home/activity_section.dart
index 9c12f6537..48033b6f7 100644
--- a/mobile-app/lib/v2/screens/home/activity_section.dart
+++ b/mobile-app/lib/v2/screens/home/activity_section.dart
@@ -5,7 +5,7 @@ import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/features/components/skeleton.dart';
 import 'package:resonance_network_wallet/models/combined_transactions_list.dart';
 import 'package:resonance_network_wallet/providers/active_account_transactions_provider.dart';
-import 'package:resonance_network_wallet/providers/wallet_providers.dart';
+import 'package:resonance_network_wallet/providers/currency_display_provider.dart';
 import 'package:resonance_network_wallet/services/transaction_service.dart';
 import 'package:resonance_network_wallet/utils/url_utils.dart';
 import 'package:resonance_network_wallet/v2/screens/activity/activity_screen.dart';
@@ -32,7 +32,7 @@ class _ActivitySectionState extends ConsumerState<ActivitySection> {
 
   @override
   Widget build(BuildContext context) {
-    final isBalanceHidden = ref.watch(isBalanceHiddenProvider);
+    final formatTxAmount = ref.watch(txAmountDisplayProvider);
     final colors = context.colors;
     final text = context.themeText;
 
@@ -63,10 +63,10 @@ class _ActivitySectionState extends ConsumerState<ActivitySection> {
           children: [
             const SizedBox(height: 40),
             _header(colors, text, context),
-            const SizedBox(height: 24),
+            const SizedBox(height: 28),
 
             ...recentTransactions.mapIndexed((index, tx) {
-              final data = TxItemData.from(tx, widget.activeAccount.accountId);
+              final data = TxItemData.from(tx, widget.activeAccount.accountId, colors);
               final isLastItem = index == recentTransactions.length - 1;
 
               return buildTxItem(
@@ -74,7 +74,7 @@ class _ActivitySectionState extends ConsumerState<ActivitySection> {
                 data,
                 colors,
                 text,
-                isBalanceHidden: isBalanceHidden,
+                formattedAmount: formatTxAmount(data.amount, isSend: data.isSend).primaryAmount,
                 isLastItem: isLastItem,
                 onTap: () {
                   showTransactionDetailSheet(context, tx, widget.activeAccount.accountId);
@@ -92,7 +92,7 @@ class _ActivitySectionState extends ConsumerState<ActivitySection> {
             _header(colors, text, context),
             const SizedBox(height: 24),
             for (var i = 0; i < 3; i++) ...[
-              const Skeleton(width: double.infinity, height: 32),
+              const Skeleton.txItem(),
               if (i < 2) Divider(color: colors.txItemSeparator, height: 24),
             ],
           ],
@@ -153,10 +153,7 @@ class _ActivitySectionState extends ConsumerState<ActivitySection> {
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Text(
-                'Get Started',
-                style: text.paragraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w500),
-              ),
+              Text('Get Started', style: text.smallTitle),
               Icon(
                 _getStartedExpanded ? Icons.keyboard_arrow_up : Icons.keyboard_arrow_down,
                 color: colors.textSecondary,
@@ -224,20 +221,16 @@ class _ActivitySectionState extends ConsumerState<ActivitySection> {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
-        Text(
-          'Activity',
-          style: text.paragraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w500),
-        ),
+        Text('Activity', style: text.smallTitle),
         GestureDetector(
           onTap: () => Navigator.push(context, MaterialPageRoute(builder: (_) => const ActivityScreen())),
           child: Text(
             'View All',
-            style: text.paragraph?.copyWith(
-              color: Colors.transparent,
-              shadows: [Shadow(color: colors.textSecondary, offset: const Offset(0, -2))],
+            style: text.smallTitle?.copyWith(
+              color: colors.textMuted,
               decoration: TextDecoration.underline,
-              decorationColor: colors.textSecondary,
-              decorationStyle: TextDecorationStyle.solid,
+              decorationColor: colors.textMuted,
+              decorationStyle: TextDecorationStyle.dotted,
               decorationThickness: 1.0,
             ),
           ),
diff --git a/mobile-app/lib/v2/screens/home/home_screen.dart b/mobile-app/lib/v2/screens/home/home_screen.dart
index 47c997484..672ba9a05 100644
--- a/mobile-app/lib/v2/screens/home/home_screen.dart
+++ b/mobile-app/lib/v2/screens/home/home_screen.dart
@@ -1,25 +1,29 @@
-import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/features/components/button.dart';
-import 'package:resonance_network_wallet/features/components/shared_address_action_sheet.dart';
+import 'package:resonance_network_wallet/features/components/dotted_border.dart';
 import 'package:resonance_network_wallet/features/components/skeleton.dart';
+import 'package:resonance_network_wallet/features/components/shared_address_action_sheet.dart';
 import 'package:resonance_network_wallet/providers/remote_config_provider.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart' hide ButtonVariant;
-import 'package:resonance_network_wallet/v2/components/glass_icon_button.dart';
-import 'package:resonance_network_wallet/v2/screens/accounts/accounts_sheet.dart';
-import 'package:resonance_network_wallet/v2/screens/receive/receive_sheet.dart';
-import 'package:resonance_network_wallet/v2/screens/send/send_sheet.dart';
+import 'package:resonance_network_wallet/v2/components/amount_display_with_conversion.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_icon_button.dart';
+import 'package:resonance_network_wallet/v2/screens/accounts/open_accounts_management_button.dart';
+import 'package:resonance_network_wallet/v2/screens/receive/receive_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/send/input_amount_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/send/select_recipient_screen.dart';
 import 'package:resonance_network_wallet/v2/screens/settings/settings_screen.dart';
 import 'package:resonance_network_wallet/v2/screens/pos/pos_amount_screen.dart';
 import 'package:resonance_network_wallet/v2/screens/swap/swap_screen.dart';
+import 'package:resonance_network_wallet/models/filtered_transactions_params.dart';
 import 'package:resonance_network_wallet/providers/account_id_list_cache.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/providers/active_account_transactions_provider.dart';
 import 'package:resonance_network_wallet/providers/filtered_all_transactions_provider.dart';
 import 'package:resonance_network_wallet/providers/route_intent_providers.dart';
+import 'package:resonance_network_wallet/providers/currency_display_provider.dart';
 import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
@@ -34,8 +38,6 @@ class HomeScreen extends ConsumerStatefulWidget {
 }
 
 class _HomeScreenState extends ConsumerState<HomeScreen> {
-  final NumberFormattingService _fmt = NumberFormattingService();
-
   Future<void> _refresh() async {
     final active = ref.read(activeAccountProvider).value;
     ref.invalidate(balanceProviderFamily);
@@ -43,64 +45,68 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
     ref.invalidate(activeAccountTransactionsProvider);
     if (active != null) {
       await ref
-          .read(filteredPaginationControllerProviderFamily(AccountIdListCache.get([active.account.accountId])).notifier)
+          .read(
+            filteredPaginationControllerProviderFamily(
+              FilteredTransactionsParams(
+                accountIds: AccountIdListCache.get([active.account.accountId]),
+                filter: TransactionFilter.all,
+              ),
+            ).notifier,
+          )
           .loadingRefresh();
     }
   }
 
-  void _processIntentIfAvailable() {
-    final payment = ref.read(paymentIntentProvider);
-    if (payment != null) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        ref.read(paymentIntentProvider.notifier).state = null;
-        showSendSheetV2(context, address: payment.to, amount: payment.amount, isPayMode: true);
-      });
-      return;
-    }
-
-    final shared = ref.read(sharedAccountIntentProvider);
-    if (shared != null) {
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        ref.read(sharedAccountIntentProvider.notifier).state = null;
-        showSharedAddressActionSheet(context, shared);
-      });
-    }
+  Future<void> _toggleBalanceHidden() async {
+    final notifier = ref.read(isBalanceHiddenProvider.notifier);
+    await notifier.setIsBalanceHidden(!ref.read(isBalanceHiddenProvider));
   }
 
-  Future<void> toggleBalanceHidden(bool isBalanceHidden) async {
-    final isBalanceHiddenNotifier = ref.read(isBalanceHiddenProvider.notifier);
-    await isBalanceHiddenNotifier.setIsBalanceHidden(!isBalanceHidden);
+  Future<void> _toggleFlip() async {
+    await ref.read(isCurrencyFlippedProvider.notifier).toggle();
   }
 
   @override
   Widget build(BuildContext context) {
-    _processIntentIfAvailable();
+    ref.listen(paymentIntentProvider, (_, payment) {
+      if (payment == null) return;
+      ref.read(paymentIntentProvider.notifier).state = null;
+      Navigator.push(
+        context,
+        MaterialPageRoute(
+          builder: (_) =>
+              InputAmountScreen(recipientAddress: payment.to, initialAmount: payment.amount, isPayMode: true),
+        ),
+      );
+    });
+
+    ref.listen(sharedAccountIntentProvider, (_, shared) {
+      if (shared == null) return;
+      ref.read(sharedAccountIntentProvider.notifier).state = null;
+      showSharedAddressActionSheet(context, shared);
+    });
 
-    final isBalanceHidden = ref.watch(isBalanceHiddenProvider);
     final isPosMode = ref.watch(posModeProvider);
     final accountAsync = ref.watch(activeAccountProvider);
-    final balanceAsync = ref.watch(balanceProvider);
-    final txAsync = ref.watch(activeAccountTransactionsProvider);
+    final txAsync = ref.watch(activeAccountTransactionsProvider(TransactionFilter.all));
     final colors = context.colors;
     final text = context.themeText;
 
     Widget screen = accountAsync.when(
-      loading: () => ScaffoldBase(
-        child: Center(child: CircularProgressIndicator(color: colors.textPrimary)),
-      ),
+      loading: () => const ScaffoldBase(mainContent: Center(child: Loader())),
       error: (e, _) => ScaffoldBase(
-        child: Center(
+        mainContent: Center(
           child: Text('Error: $e', style: text.detail?.copyWith(color: colors.textError)),
         ),
       ),
       data: (active) {
         if (active == null) {
-          return const ScaffoldBase(child: Center(child: Text('No active account')));
+          return const ScaffoldBase(mainContent: Center(child: Text('No active account')));
         }
         return ScaffoldBase.refreshable(
           onRefresh: _refresh,
           slivers: [
-            _buildContent(active, balanceAsync, isBalanceHidden, colors, text),
+            _buildContent(active, colors, text),
             ActivitySection(txAsync: txAsync, activeAccount: active.account, onRetry: _refresh),
             SizedBox(height: isPosMode ? 120 : 58),
           ],
@@ -117,60 +123,63 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
           left: 24,
           right: 24,
           bottom: MediaQuery.of(context).padding.bottom + 24,
-          child: _buildPosButton(colors, text),
+          child: Material(color: Colors.transparent, child: _buildPosButton(colors, text)),
         ),
       ],
     );
   }
 
   Widget _buildPosButton(AppColorsV2 colors, AppTextTheme text) {
-    return Button(
+    return QuantusButton.simple(
       label: 'New Charge',
-      variant: ButtonVariant.accent,
-      onPressed: () => Navigator.push(context, MaterialPageRoute(builder: (_) => const PosAmountScreen())),
+      variant: ButtonVariant.success,
+      onTap: () => Navigator.push(context, MaterialPageRoute(builder: (_) => const PosAmountScreen())),
       textStyle: text.smallTitle?.copyWith(fontWeight: FontWeight.w700, fontSize: 20, decoration: TextDecoration.none),
     );
   }
 
-  Widget _buildContent(
-    DisplayAccount active,
-    AsyncValue<BigInt> balanceAsync,
-    bool isBalanceHidden,
-    AppColorsV2 colors,
-    AppTextTheme text,
-  ) {
+  Widget _buildContent(DisplayAccount active, AppColorsV2 colors, AppTextTheme text) {
     return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         const SizedBox(height: 16),
-        _buildTopBar(active, isBalanceHidden, colors),
-        const SizedBox(height: 64),
-        _buildBalance(balanceAsync, isBalanceHidden, colors, text),
-        const SizedBox(height: 64),
-        if (active is RegularAccount) _buildActionButtons(),
+        _buildTopBar(),
+        const SizedBox(height: 40),
+        _buildBalance(colors, text),
+        const SizedBox(height: 40),
+        if (active is RegularAccount) ...[_buildActionButtons(), const SizedBox(height: 40)],
+        DottedBorder(
+          dashLength: 3,
+          gapLength: 5,
+          color: colors.borderButton.useOpacity(0.5),
+          child: const SizedBox(width: double.infinity, height: 1),
+        ),
       ],
     );
   }
 
-  Widget _buildTopBar(DisplayAccount active, bool isBalanceHidden, AppColorsV2 colors) {
+  Widget _buildTopBar() {
+    final isBalanceHidden = ref.watch(isBalanceHiddenProvider);
+
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
-        GestureDetector(
-          onTap: () => showAccountsSheet(context),
-          child: SvgPicture.asset('assets/v2/uppercase_q.svg', width: 32, height: 32),
-        ),
+        const OpenAccountsManagementButton(),
         Row(
           children: [
-            _glassCircleButton(
+            QuantusIconButton.circular(
+              style: IconButtonStyle.glass,
               icon: isBalanceHidden ? Icons.visibility_off_outlined : Icons.visibility_outlined,
-              colors: colors,
-              onTap: () => toggleBalanceHidden(isBalanceHidden),
+              onTap: _toggleBalanceHidden,
+              isActive: isBalanceHidden,
+              size: IconButtonSize.large,
             ),
             const SizedBox(width: 12),
-            _glassCircleButton(
+            QuantusIconButton.circular(
+              style: IconButtonStyle.glass,
               icon: Icons.settings_outlined,
-              colors: colors,
               onTap: () => Navigator.push(context, MaterialPageRoute(builder: (_) => const SettingsScreenV2())),
+              size: IconButtonSize.large,
             ),
           ],
         ),
@@ -178,45 +187,28 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
     );
   }
 
-  Widget _glassCircleButton({required IconData icon, required AppColorsV2 colors, required VoidCallback onTap}) {
-    return GlassIconButton.circular(icon: icon, onTap: onTap);
-  }
+  Widget _buildBalance(AppColorsV2 colors, AppTextTheme text) {
+    final currencyAsync = ref.watch(balanceDisplayProvider);
 
-  Widget _buildBalance(AsyncValue<BigInt> balanceAsync, bool isBalanceHidden, AppColorsV2 colors, AppTextTheme text) {
     return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        balanceAsync.when(
-          data: (balance) {
-            final formatted = isBalanceHidden ? '-----' : _fmt.formatBalance(balance, maxDecimals: 2);
-            final usdFormatted = isBalanceHidden ? '-----' : '\$${_fmt.formatBalance(balance, maxDecimals: 2)}';
-            return Column(
-              children: [
-                Stack(
-                  alignment: Alignment.center,
-                  children: [
-                    ImageFiltered(
-                      imageFilter: ImageFilter.blur(sigmaX: 3, sigmaY: 3),
-                      child: Text(
-                        '$formatted ${AppConstants.tokenSymbol}',
-                        style: text.extraLargeTitle?.copyWith(color: colors.textSecondary),
-                      ),
-                    ),
-                    Text(
-                      '$formatted ${AppConstants.tokenSymbol}',
-                      style: text.extraLargeTitle?.copyWith(color: colors.textPrimary),
-                    ),
-                  ],
-                ),
-                const SizedBox(height: 6),
-                Text('≈ $usdFormatted', style: text.paragraph?.copyWith(color: colors.textSecondary)),
-              ],
+        currencyAsync.when(
+          data: (display) {
+            return AmountDisplayWithConversion(
+              amountDisplay: display,
+              onFlip: _toggleFlip,
+              alignment: CrossAxisAlignment.center,
+              useQuanLogo: true,
             );
           },
-          loading: () => Row(
-            mainAxisAlignment: MainAxisAlignment.center,
+          loading: () => const Column(
+            crossAxisAlignment: CrossAxisAlignment.center,
             children: [
-              const Skeleton(width: 200, height: 36),
-              Text(' ${AppConstants.tokenSymbol}', style: text.smallTitle?.copyWith(color: colors.textPrimary)),
+              SizedBox(height: 12),
+              Row(mainAxisAlignment: MainAxisAlignment.center, children: [Skeleton(width: 200, height: 36)]),
+              SizedBox(height: 16),
+              Row(mainAxisAlignment: MainAxisAlignment.center, children: [Skeleton(width: 100, height: 18)]),
             ],
           ),
           error: (_, _) => Text('Error loading balance', style: text.detail?.copyWith(color: colors.textError)),
@@ -231,22 +223,22 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
     final receiveCard = _actionCard(
       iconAsset: 'assets/v2/action_receive.svg',
       label: 'Receive',
-      onTap: () => showReceiveSheetV2(context),
+      onTap: () => Navigator.push(context, MaterialPageRoute(builder: (_) => const ReceiveScreen())),
     );
 
     final sendCard = _actionCard(
       iconAsset: 'assets/v2/action_send.svg',
       label: 'Send',
-      onTap: () => showSendSheetV2(context),
+      onTap: () => Navigator.push(context, MaterialPageRoute(builder: (_) => const SelectRecipientScreen())),
     );
 
     if (!enableSwap) {
       return Row(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          SizedBox(width: 104, child: receiveCard),
-          const SizedBox(width: 32),
-          SizedBox(width: 104, child: sendCard),
+          SizedBox(width: 151, child: receiveCard),
+          const SizedBox(width: 20),
+          SizedBox(width: 151, child: sendCard),
         ],
       );
     }
@@ -269,12 +261,14 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
   }
 
   Widget _actionCard({required String iconAsset, required String label, required VoidCallback onTap}) {
-    return GlassButton.simple(
+    return QuantusButton.simple(
       label: label,
       onTap: onTap,
       icon: SvgPicture.asset(iconAsset, width: 24, height: 24),
       iconPlacement: IconPlacement.top,
       padding: const EdgeInsets.all(14),
+      variant: ButtonVariant.secondary,
+      textStyle: context.themeText.paragraph?.copyWith(color: context.colors.textPrimary.useOpacity(0.8)),
     );
   }
 }
diff --git a/mobile-app/lib/v2/screens/import/import_wallet_screen.dart b/mobile-app/lib/v2/screens/import/import_wallet_screen.dart
index 6b578a81f..b8499ca58 100644
--- a/mobile-app/lib/v2/screens/import/import_wallet_screen.dart
+++ b/mobile-app/lib/v2/screens/import/import_wallet_screen.dart
@@ -4,8 +4,9 @@ import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/providers/remote_config_provider.dart';
 import 'package:resonance_network_wallet/services/firebase_messaging_service.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
 import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
 import 'package:resonance_network_wallet/v2/screens/home/home_screen.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
@@ -51,7 +52,9 @@ class _ImportWalletScreenV2State extends ConsumerState<ImportWalletScreenV2> {
   bool get _hasInput => _controller.text.trim().isNotEmpty;
 
   Future<void> _import() async {
+    final accounts = ref.read(accountsProvider).value ?? <Account>[];
     final mnemonic = _controller.text.trim();
+
     setState(() {
       _isLoading = true;
       _error = null;
@@ -68,7 +71,12 @@ class _ImportWalletScreenV2State extends ConsumerState<ImportWalletScreenV2> {
       final key = HdWalletService().keyPairAtIndex(mnemonic, 0);
       await _settingsService.setMnemonic(mnemonic, widget.walletIndex);
       await _accountsService.addAccount(
-        Account(walletIndex: widget.walletIndex, index: 0, name: 'Account 1', accountId: key.ss58Address),
+        Account(
+          walletIndex: widget.walletIndex,
+          index: 0,
+          name: 'Account ${accounts.length + 1}',
+          accountId: key.ss58Address,
+        ),
       );
 
       if (!HdWalletService.isDevAccount(mnemonic)) {
@@ -79,8 +87,10 @@ class _ImportWalletScreenV2State extends ConsumerState<ImportWalletScreenV2> {
       _settingsService.setReferralCheckCompleted();
       _settingsService.setExistingUserSeenPromoVideo();
 
-      if (ref.read(remoteConfigProvider).enableRemoteNotifications) {
+      if (ref.read(remoteConfigProvider).enableRemoteNotifications && widget.walletIndex == 0) {
         ref.read(firebaseMessagingServiceProvider).registerDeviceIfPossible();
+      } else if (ref.read(remoteConfigProvider).enableRemoteNotifications && widget.walletIndex > 0) {
+        ref.read(firebaseMessagingServiceProvider).insertNewAddress(key.ss58Address);
       }
 
       if (!mounted) return;
@@ -110,49 +120,37 @@ class _ImportWalletScreenV2State extends ConsumerState<ImportWalletScreenV2> {
   Widget build(BuildContext context) {
     final colors = context.colors;
     final text = context.themeText;
+    final fieldTextStyle = text.smallTitle?.copyWith(color: colors.checksum, fontWeight: FontWeight.w400);
 
-    var textSTyleSmallTitle = text.smallTitle?.copyWith(
-      fontSize: 20,
-      color: colors.textPrimary,
-      fontWeight: FontWeight.w400,
-      height: 1.35,
-    );
     return ScaffoldBase(
-      appBar: V2AppBar(
-        title: 'Import Wallet',
-        trailing: GestureDetector(
-          onTap: () => Navigator.pop(context),
-          child: Icon(Icons.close, color: colors.textPrimary, size: 24),
-        ),
-      ),
-      child: GestureDetector(
+      appBar: const V2AppBar(title: 'Import Wallet'),
+      mainContent: GestureDetector(
         onTap: () => FocusScope.of(context).unfocus(),
         behavior: HitTestBehavior.opaque,
         child: SingleChildScrollView(
           child: Column(
             children: [
-              const SizedBox(height: 20),
               Text(
-                'Restore an existing wallet with your 24 word recovery phrase',
-                textAlign: TextAlign.center,
-                style: textSTyleSmallTitle,
+                'Restore an existing wallet with your 12 or 24 words recovery phrase',
+                style: text.smallParagraph?.copyWith(color: colors.textSecondary),
               ),
-              const SizedBox(height: 24),
+              const SizedBox(height: 16),
               Container(
                 height: 202,
-                padding: const EdgeInsets.all(20),
+                padding: const EdgeInsets.all(16),
                 decoration: BoxDecoration(
-                  color: Colors.white.withValues(alpha: 0.1),
+                  color: colors.surfaceDeep,
                   borderRadius: BorderRadius.circular(14),
+                  border: Border.all(color: colors.borderButton, width: 1),
                 ),
                 child: TextField(
                   controller: _controller,
                   focusNode: _focusNode,
                   onChanged: (_) => setState(() {}),
-                  style: textSTyleSmallTitle,
+                  style: fieldTextStyle,
                   decoration: InputDecoration.collapsed(
                     hintText: 'Type in or paste your recovery phrase. Separate words with spaces.',
-                    hintStyle: textSTyleSmallTitle?.copyWith(color: colors.textSecondary),
+                    hintStyle: fieldTextStyle?.copyWith(color: colors.textSecondary),
                   ),
                   maxLines: null,
                   keyboardType: TextInputType.multiline,
@@ -167,20 +165,19 @@ class _ImportWalletScreenV2State extends ConsumerState<ImportWalletScreenV2> {
                   textAlign: TextAlign.center,
                 ),
               ],
-              const SizedBox(height: 24),
-              GlassButton.simple(
-                key: _buttonKey,
-                label: 'Import Wallet',
-                onTap: _import,
-                isLoading: _isLoading,
-                variant: ButtonVariant.secondary,
-                isDisabled: !_hasInput,
-              ),
-              const SizedBox(height: 24),
             ],
           ),
         ),
       ),
+      bottomContent: ScaffoldBaseBottomContent(
+        child: QuantusButton.simple(
+          key: _buttonKey,
+          label: 'Import',
+          onTap: _import,
+          isLoading: _isLoading,
+          isDisabled: !_hasInput,
+        ),
+      ),
     );
   }
 
diff --git a/mobile-app/lib/v2/screens/pos/pos_amount_screen.dart b/mobile-app/lib/v2/screens/pos/pos_amount_screen.dart
index 79e3a2a1e..b79756e05 100644
--- a/mobile-app/lib/v2/screens/pos/pos_amount_screen.dart
+++ b/mobile-app/lib/v2/screens/pos/pos_amount_screen.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:intl/intl.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/features/components/button.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
 import 'package:resonance_network_wallet/v2/screens/pos/pos_qr_screen.dart';
@@ -18,17 +18,18 @@ class PosAmountScreen extends ConsumerStatefulWidget {
 
 class _PosAmountScreenState extends ConsumerState<PosAmountScreen> {
   String _input = '0';
-  final _fmt = NumberFormattingService();
-  final _decimalFilter = DecimalInputFilter();
+  LocaleNumberConfig get _localeConfig => ref.read(localeNumberConfigProvider);
 
   void _onDigit(String digit) {
-    final oldText = _input == '0' && digit != '.' && digit != ',' ? '' : _input;
+    final sep = _localeConfig.decimalSeparator;
+    final oldText = _input == '0' && digit != sep ? '' : _input;
     final newText = oldText + digit;
 
     final oldValue = TextEditingValue(text: oldText);
     final newValue = TextEditingValue(text: newText);
 
-    final formatted = _decimalFilter.formatEditUpdate(oldValue, newValue);
+    final filter = DecimalInputFilter(localeConfig: _localeConfig);
+    final formatted = filter.formatEditUpdate(oldValue, newValue);
 
     setState(() {
       _input = formatted.text.isEmpty ? '0' : formatted.text;
@@ -48,13 +49,15 @@ class _PosAmountScreenState extends ConsumerState<PosAmountScreen> {
   void _onClear() => setState(() => _input = '0');
 
   void _onCharge() {
-    final amount = _fmt.parseAmount(_input);
+    final formattingService = ref.watch(numberFormattingServiceProvider);
+    final amount = formattingService.parseAmount(_input);
     if (amount == null || amount <= BigInt.zero) return;
     Navigator.push(context, MaterialPageRoute(builder: (_) => PosQrScreen(amount: _input)));
   }
 
   bool get _isValid {
-    final amount = _fmt.parseAmount(_input);
+    final formattingService = ref.watch(numberFormattingServiceProvider);
+    final amount = formattingService.parseAmount(_input);
     return amount != null && amount > BigInt.zero;
   }
 
@@ -65,7 +68,7 @@ class _PosAmountScreenState extends ConsumerState<PosAmountScreen> {
 
     return ScaffoldBase(
       appBar: const V2AppBar(title: 'New Charge'),
-      child: Column(
+      mainContent: Column(
         children: [
           Expanded(
             child: Center(
@@ -92,7 +95,7 @@ class _PosAmountScreenState extends ConsumerState<PosAmountScreen> {
   }
 
   Widget _buildKeypad(AppColorsV2 colors, AppTextTheme text) {
-    final decimalSeparator = NumberFormat().symbols.DECIMAL_SEP;
+    final decimalSeparator = _localeConfig.decimalSeparator;
     final keys = [
       ['1', '2', '3'],
       ['4', '5', '6'],
diff --git a/mobile-app/lib/v2/screens/pos/pos_qr_screen.dart b/mobile-app/lib/v2/screens/pos/pos_qr_screen.dart
index c7cc1462d..8aa367f95 100644
--- a/mobile-app/lib/v2/screens/pos/pos_qr_screen.dart
+++ b/mobile-app/lib/v2/screens/pos/pos_qr_screen.dart
@@ -6,13 +6,15 @@ import 'package:qr_flutter/qr_flutter.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/providers/pending_transactions_provider.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
 import 'package:resonance_network_wallet/services/pending_transaction_polling_service.dart';
 import 'package:resonance_network_wallet/services/pos_service.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/services/tx_watch_service.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
+import 'package:resonance_network_wallet/v2/screens/pos/pos_amount_screen.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
-import 'package:resonance_network_wallet/v2/screens/pos/pos_amount_screen.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
 
@@ -26,7 +28,6 @@ class PosQrScreen extends ConsumerStatefulWidget {
 
 class _PosQrScreenState extends ConsumerState<PosQrScreen> {
   final _posService = PosService();
-  final _fmt = NumberFormattingService();
   PosPaymentRequest? _request;
 
   final _txWatch = TxWatchService();
@@ -44,10 +45,11 @@ class _PosQrScreenState extends ConsumerState<PosQrScreen> {
   }
 
   void _startWatching() {
+    final formattingService = ref.watch(numberFormattingServiceProvider);
     final active = ref.read(activeAccountProvider).value;
     if (active == null) return;
 
-    final expectedPlanck = _fmt.parseAmount(widget.amount);
+    final expectedPlanck = formattingService.parseAmount(widget.amount);
     if (expectedPlanck == null) {
       print('[PosQr] ERROR: failed to parse amount "${widget.amount}"');
       if (mounted) setState(() => _watchError = 'Invalid amount. Tap to retry.');
@@ -126,8 +128,8 @@ class _PosQrScreenState extends ConsumerState<PosQrScreen> {
 
     return ScaffoldBase(
       appBar: V2AppBar(title: _isPaid ? 'Payment Received' : 'Scan to Pay'),
-      child: accountAsync.when(
-        loading: () => Center(child: CircularProgressIndicator(color: colors.textPrimary)),
+      mainContent: accountAsync.when(
+        loading: () => const Center(child: Loader()),
         error: (e, _) => Center(
           child: Text('Error: $e', style: text.detail?.copyWith(color: colors.textError)),
         ),
@@ -154,7 +156,7 @@ class _PosQrScreenState extends ConsumerState<PosQrScreen> {
           style: text.mediumTitle?.copyWith(color: colors.textSecondary),
         ),
         const Spacer(),
-        GlassButton.simple(label: 'Done', onTap: _newCharge, variant: ButtonVariant.primary),
+        QuantusButton.simple(label: 'Done', onTap: _newCharge, variant: ButtonVariant.primary),
         const SizedBox(height: 24),
       ],
     );
@@ -178,7 +180,7 @@ class _PosQrScreenState extends ConsumerState<PosQrScreen> {
         const SizedBox(height: 12),
         Text('Ref: ${request.refId}', style: text.detail?.copyWith(color: colors.textTertiary)),
         const Spacer(),
-        GlassButton.simple(label: 'New Charge', onTap: _newCharge, variant: ButtonVariant.secondary),
+        QuantusButton.simple(label: 'New Charge', onTap: _newCharge, variant: ButtonVariant.secondary),
         const SizedBox(height: 16),
         _buildWaitingButton(colors, text),
         const SizedBox(height: 24),
@@ -188,17 +190,13 @@ class _PosQrScreenState extends ConsumerState<PosQrScreen> {
 
   Widget _buildWaitingButton(AppColorsV2 colors, AppTextTheme text) {
     if (_watching) {
-      return GlassButton(
+      return QuantusButton(
         variant: ButtonVariant.primary,
         onTap: () {},
         child: Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            SizedBox(
-              width: 18,
-              height: 18,
-              child: CircularProgressIndicator(color: colors.textSecondary, strokeWidth: 2),
-            ),
+            const Loader(),
             const SizedBox(width: 10),
             Text('Waiting for payment', style: text.smallTitle?.copyWith(color: colors.textSecondary, fontSize: 16)),
           ],
@@ -211,10 +209,10 @@ class _PosQrScreenState extends ConsumerState<PosQrScreen> {
         if (_watchError != null) ...[
           Text('Network Error', style: text.detail?.copyWith(color: colors.textError)),
           const SizedBox(height: 8),
-          GlassButton.simple(label: 'Try Again', onTap: _startWatching, variant: ButtonVariant.secondary),
+          QuantusButton.simple(label: 'Try Again', onTap: _startWatching, variant: ButtonVariant.secondary),
           const SizedBox(height: 12),
         ],
-        GlassButton.simple(label: 'Done', onTap: _newCharge, variant: ButtonVariant.primary),
+        QuantusButton.simple(label: 'Done', onTap: _newCharge, variant: ButtonVariant.primary),
       ],
     );
   }
diff --git a/mobile-app/lib/v2/screens/receive/receive_screen.dart b/mobile-app/lib/v2/screens/receive/receive_screen.dart
new file mode 100644
index 000000000..349eb02d3
--- /dev/null
+++ b/mobile-app/lib/v2/screens/receive/receive_screen.dart
@@ -0,0 +1,211 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:qr_flutter/qr_flutter.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
+import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
+import 'package:resonance_network_wallet/v2/components/address_details_card.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/components/share_account_button.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
+import 'package:resonance_network_wallet/shared/utils/share_utils.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/segmented_controls.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+
+enum ReceiveTab { qrCode, address }
+
+class ReceiveScreen extends ConsumerStatefulWidget {
+  const ReceiveScreen({super.key});
+
+  @override
+  ConsumerState<ReceiveScreen> createState() => _ReceiveScreenState();
+}
+
+class _ReceiveScreenState extends ConsumerState<ReceiveScreen> {
+  ReceiveTab _selectedTab = ReceiveTab.qrCode;
+  String? _accountId;
+  String? _checksum;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadAccountData();
+  }
+
+  Future<void> _loadAccountData() async {
+    final settingsService = ref.read(settingsServiceProvider);
+    final checksumService = ref.read(humanReadableChecksumServiceProvider);
+
+    try {
+      final account = (await settingsService.getActiveAccount())!;
+      final checksum = await checksumService.getHumanReadableName(account.account.accountId);
+      setState(() {
+        _accountId = account.account.accountId;
+        _checksum = checksum;
+      });
+    } catch (e) {
+      debugPrint('Error loading account data: $e');
+
+      if (mounted) {
+        context.showErrorToaster(message: 'Error loading account data: $e');
+      }
+    }
+  }
+
+  void _share() {
+    if (_accountId != null && _checksum != null) {
+      shareAccountDetails(context, _accountId!, checksum: _checksum!);
+    }
+  }
+
+  void _copyAccountDetails(BuildContext context) {
+    context.copyTextWithToaster(
+      'Account Id:\n$_accountId\n\nCheckphrase:\n$_checksum',
+      message: 'Account details copied to clipboard',
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final tabs = [
+      const SegmentedControlItem(label: 'QR Code', value: ReceiveTab.qrCode),
+      const SegmentedControlItem(label: 'Address', value: ReceiveTab.address),
+    ];
+
+    final isLoading = _accountId == null || _checksum == null;
+
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Receive'),
+      mainContent: Column(
+        children: [
+          SegmentedControls<ReceiveTab>(
+            items: tabs,
+            selectedValue: _selectedTab,
+            onChanged: (value) {
+              setState(() {
+                _selectedTab = value;
+              });
+            },
+          ),
+          const SizedBox(height: 18),
+          if (isLoading)
+            const Expanded(child: Center(child: Loader()))
+          else if (_selectedTab == ReceiveTab.qrCode)
+            QrCodeTab(accountId: _accountId!, checksum: _checksum!)
+          else
+            AddressTab(accountId: _accountId!, checksum: _checksum!),
+        ],
+      ),
+      bottomContent: _buildBottomContent(isLoading, _selectedTab),
+    );
+  }
+
+  Widget? _buildBottomContent(bool isLoading, ReceiveTab selectedTab) {
+    Widget content;
+
+    if (isLoading) {
+      return null;
+    }
+
+    if (_selectedTab == ReceiveTab.qrCode) {
+      content = ShareAccountButton(onTap: _share, isDisabled: isLoading);
+    } else {
+      content = Row(
+        children: [
+          Expanded(
+            child: QuantusButton.simple(
+              label: 'Copy',
+              onTap: () => _copyAccountDetails(context),
+              isDisabled: isLoading,
+              icon: Icon(Icons.copy, size: 20, color: context.colors.textPrimary),
+              iconPlacement: IconPlacement.leading,
+              variant: ButtonVariant.secondary,
+            ),
+          ),
+          const SizedBox(width: 18),
+          Expanded(
+            child: ShareAccountButton(onTap: _share, isDisabled: isLoading),
+          ),
+        ],
+      );
+    }
+
+    return ScaffoldBaseBottomContent(child: content);
+  }
+}
+
+class QrCodeTab extends StatelessWidget {
+  const QrCodeTab({super.key, required this.accountId, required this.checksum});
+
+  final String accountId;
+  final String checksum;
+
+  @override
+  Widget build(BuildContext context) {
+    final qrSize = 267.0;
+    final qrLogoSize = 64.0;
+
+    return Expanded(
+      child: Column(
+        children: [
+          Container(
+            decoration: BoxDecoration(
+              border: Border.all(color: context.colors.textTertiary, width: 1),
+              borderRadius: BorderRadius.circular(16),
+            ),
+            width: qrSize,
+            height: qrSize,
+            child: QrImageView(
+              data: accountId,
+              errorCorrectionLevel: QrErrorCorrectLevel.M,
+              embeddedImage: const AssetImage('assets/v2/uppercase_q_black_bg.png'),
+              embeddedImageStyle: QrEmbeddedImageStyle(size: Size(qrLogoSize, qrLogoSize)),
+              version: QrVersions.auto,
+              size: qrSize,
+              padding: const EdgeInsets.all(16),
+              eyeStyle: const QrEyeStyle(eyeShape: QrEyeShape.square, color: Colors.white),
+              dataModuleStyle: const QrDataModuleStyle(dataModuleShape: QrDataModuleShape.square, color: Colors.white),
+            ),
+          ),
+
+          const SizedBox(height: 12),
+          Text(
+            checksum,
+            style: context.themeText.paragraph?.copyWith(color: context.colors.checksum),
+            textAlign: TextAlign.center,
+          ),
+
+          const SizedBox(height: 8),
+          Text(
+            accountId,
+            style: context.themeText.smallParagraph?.copyWith(
+              color: context.colors.textPrimary,
+              fontWeight: FontWeight.w500,
+            ),
+            textAlign: TextAlign.center,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class AddressTab extends StatelessWidget {
+  final String accountId;
+  final String checksum;
+
+  const AddressTab({super.key, required this.accountId, required this.checksum});
+
+  @override
+  Widget build(BuildContext context) {
+    return Expanded(
+      child: AddressDetailsCard(accountId: accountId, checksum: checksum),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/receive/receive_sheet.dart b/mobile-app/lib/v2/screens/receive/receive_sheet.dart
deleted file mode 100644
index 87bb755de..000000000
--- a/mobile-app/lib/v2/screens/receive/receive_sheet.dart
+++ /dev/null
@@ -1,212 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:qr_flutter/qr_flutter.dart';
-import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
-import 'package:resonance_network_wallet/v2/components/bottom_sheet_container.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/components/glass_icon_button.dart';
-import 'package:resonance_network_wallet/shared/utils/share_utils.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
-
-class ReceiveSheet extends StatefulWidget {
-  const ReceiveSheet({super.key});
-
-  @override
-  State<ReceiveSheet> createState() => _ReceiveSheetState();
-}
-
-class _ReceiveSheetState extends State<ReceiveSheet> {
-  String? _accountId;
-  String? _checksum;
-  Future<String>? _checksumFuture;
-
-  final HumanReadableChecksumService _checksumService = HumanReadableChecksumService();
-  final SettingsService _settingsService = SettingsService();
-
-  @override
-  void initState() {
-    super.initState();
-    _loadAccountData();
-  }
-
-  Future<void> _loadAccountData() async {
-    try {
-      final account = (await _settingsService.getActiveAccount())!;
-      setState(() {
-        _accountId = account.account.accountId;
-        _checksumFuture = _checksumService.getHumanReadableName(account.account.accountId);
-      });
-    } catch (e) {
-      debugPrint('Error loading account data: $e');
-    }
-  }
-
-  void _copyAddress() {
-    if (_accountId != null) {
-      context.copyTextWithToaster(_accountId!);
-    }
-  }
-
-  void _copyChecksum() {
-    if (_checksum != null) {
-      context.copyTextWithToaster(_checksum!, message: 'Checkphrase copied');
-    }
-  }
-
-  void _share() {
-    if (_accountId != null) {
-      shareAccountDetails(context, _accountId!, checksum: _checksum ?? '');
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final colors = context.colors;
-    final text = context.themeText;
-
-    return BottomSheetContainer(
-      title: 'Receive',
-      child: _accountId == null
-          ? Padding(
-              padding: const EdgeInsets.symmetric(vertical: 80),
-              child: Center(child: CircularProgressIndicator(color: colors.textPrimary)),
-            )
-          : Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                _buildQrCode(colors),
-                const SizedBox(height: 20),
-                _buildAddress(colors, text),
-                const SizedBox(height: 9),
-                _buildChecksum(colors, text),
-                const SizedBox(height: 32),
-                _buildButtons(colors, text),
-              ],
-            ),
-    );
-  }
-
-  Widget _buildQrCode(AppColorsV2 colors) {
-    return SizedBox(
-      width: 267,
-      height: 267,
-      child: Stack(
-        alignment: Alignment.center,
-        children: [
-          ClipRRect(
-            borderRadius: BorderRadius.circular(16),
-            child: QrImageView(
-              data: _accountId!,
-              version: QrVersions.auto,
-              size: 267,
-              padding: const EdgeInsets.all(16),
-              backgroundColor: Colors.white,
-              eyeStyle: const QrEyeStyle(eyeShape: QrEyeShape.square, color: Colors.black),
-              dataModuleStyle: const QrDataModuleStyle(dataModuleShape: QrDataModuleShape.square, color: Colors.black),
-            ),
-          ),
-          // Container(
-          //   width: 40,
-          //   height: 40,
-          //   decoration: const BoxDecoration(shape: BoxShape.circle, color: Colors.white),
-          //   child: ClipOval(child: AccountGradientImage(accountId: _accountId, width: 36.0, height: 36.0)),
-          // ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildAddress(AppColorsV2 colors, AppTextTheme text) {
-    return InkWell(
-      onTap: _copyAddress,
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Flexible(
-            child: Text(
-              _accountId!,
-              style: text.smallParagraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w500),
-              textAlign: TextAlign.center,
-            ),
-          ),
-          const SizedBox(width: 6),
-          _copyButton(colors),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildChecksum(AppColorsV2 colors, AppTextTheme text) {
-    return FutureBuilder<String>(
-      future: _checksumFuture,
-      builder: (context, snapshot) {
-        if (snapshot.connectionState == ConnectionState.waiting) {
-          return SizedBox(
-            height: 16,
-            width: 16,
-            child: CircularProgressIndicator(strokeWidth: 2, color: colors.textSecondary),
-          );
-        }
-        if (!snapshot.hasData || snapshot.data == null || snapshot.data!.isEmpty) return const SizedBox.shrink();
-
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (_checksum != snapshot.data && mounted) setState(() => _checksum = snapshot.data!);
-        });
-
-        return InkWell(
-          onTap: _copyChecksum,
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Flexible(
-                child: Text(
-                  snapshot.data!,
-                  style: text.detail?.copyWith(color: colors.accentPink),
-                  textAlign: TextAlign.center,
-                ),
-              ),
-              const SizedBox(width: 6),
-              _copyButton(colors),
-            ],
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _copyButton(AppColorsV2 colors) {
-    return const GlassIconButton.rounded(icon: Icons.copy, size: IconButtonSize.small);
-  }
-
-  Widget _buildButtons(AppColorsV2 colors, AppTextTheme text) {
-    return Row(
-      children: [
-        Expanded(
-          child: GlassButton.simple(
-            padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 16),
-            label: 'Copy',
-            onTap: _copyAddress,
-            icon: Icon(Icons.copy, size: 20, color: colors.textPrimary),
-            iconPlacement: IconPlacement.leading,
-            variant: ButtonVariant.secondary,
-          ),
-        ),
-        const SizedBox(width: 32),
-        Expanded(
-          child: GlassButton.simple(
-            padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 16),
-            label: 'Share',
-            onTap: _share,
-            icon: Icon(Icons.share, size: 20, color: colors.textPrimary),
-            iconPlacement: IconPlacement.leading,
-          ),
-        ),
-      ],
-    );
-  }
-}
-
-void showReceiveSheetV2(BuildContext context) {
-  BottomSheetContainer.show(context, builder: (_) => const ReceiveSheet());
-}
diff --git a/mobile-app/lib/v2/screens/send/address_picker_sheet.dart b/mobile-app/lib/v2/screens/send/address_picker_sheet.dart
deleted file mode 100644
index 244f549d0..000000000
--- a/mobile-app/lib/v2/screens/send/address_picker_sheet.dart
+++ /dev/null
@@ -1,159 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/features/components/account_gradient_image.dart';
-import 'package:resonance_network_wallet/v2/components/bottom_sheet_container.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
-
-class AddressPickerSheet extends StatefulWidget {
-  const AddressPickerSheet({super.key});
-
-  @override
-  State<AddressPickerSheet> createState() => _AddressPickerSheetState();
-}
-
-class _AddressPickerSheetState extends State<AddressPickerSheet> {
-  final _searchController = TextEditingController();
-  final _checksumService = HumanReadableChecksumService();
-  List<String> _addresses = [];
-  List<String> _filtered = [];
-  final Map<String, String> _checksums = {};
-
-  @override
-  void initState() {
-    super.initState();
-    _loadAddresses();
-    _searchController.addListener(_filter);
-  }
-
-  @override
-  void dispose() {
-    _searchController.dispose();
-    super.dispose();
-  }
-
-  Future<void> _loadAddresses() async {
-    final allAddresses = await RecentAddressesService().getAddresses();
-    final active = await SettingsService().getActiveAccount();
-    final currentId = active?.account.accountId;
-    final addresses = allAddresses.where((a) => a != currentId).toList();
-    if (!mounted) return;
-    setState(() {
-      _addresses = addresses;
-      _filtered = addresses;
-    });
-    for (final addr in addresses) {
-      _checksumService.getHumanReadableName(addr).then((name) {
-        if (mounted) setState(() => _checksums[addr] = name);
-      });
-    }
-  }
-
-  void _filter() {
-    final query = _searchController.text.toLowerCase();
-    setState(() {
-      _filtered = query.isEmpty
-          ? _addresses
-          : _addresses.where((a) {
-              final checksum = _checksums[a]?.toLowerCase() ?? '';
-              return a.toLowerCase().contains(query) || checksum.contains(query);
-            }).toList();
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final colors = context.colors;
-    final text = context.themeText;
-
-    return BottomSheetContainer(
-      title: 'Send To',
-      onBack: () => Navigator.pop(context),
-      child: SizedBox(
-        height: 384,
-        child: Column(
-          children: [
-            Container(
-              height: 48,
-              padding: const EdgeInsets.symmetric(horizontal: 12),
-              decoration: BoxDecoration(color: colors.surfaceGlass, borderRadius: BorderRadius.circular(14)),
-              child: Row(
-                children: [
-                  Icon(Icons.search, color: colors.textTertiary, size: 16),
-                  const SizedBox(width: 8),
-                  Expanded(
-                    child: TextField(
-                      controller: _searchController,
-                      style: text.smallParagraph?.copyWith(color: colors.textPrimary),
-                      decoration: InputDecoration(
-                        filled: true,
-                        fillColor: Colors.transparent,
-                        isDense: true,
-                        contentPadding: EdgeInsets.zero,
-                        border: InputBorder.none,
-                        hintText: 'Search',
-                        hintStyle: text.smallParagraph?.copyWith(color: colors.textTertiary),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            const SizedBox(height: 40),
-            Align(
-              alignment: Alignment.centerLeft,
-              child: Text(
-                'Recents',
-                style: text.paragraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w500),
-              ),
-            ),
-            const SizedBox(height: 24),
-            Expanded(
-              child: _filtered.isEmpty
-                  ? Center(
-                      child: Text('No recent addresses', style: text.detail?.copyWith(color: colors.textTertiary)),
-                    )
-                  : ListView.separated(
-                      padding: EdgeInsets.zero,
-                      itemCount: _filtered.length,
-                      separatorBuilder: (_, _) => const SizedBox(height: 24),
-                      itemBuilder: (context, i) => _addressItem(_filtered[i], colors, text),
-                    ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _addressItem(String address, AppColorsV2 colors, AppTextTheme text) {
-    final checksum = _checksums[address];
-    return GestureDetector(
-      onTap: () => Navigator.pop(context, address),
-      child: Row(
-        children: [
-          AccountGradientImage(accountId: address, width: 40.0, height: 40.0),
-          const SizedBox(width: 17),
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                if (checksum != null) Text(checksum, style: text.smallParagraph?.copyWith(color: colors.accentPink)),
-                const SizedBox(height: 4),
-                Text(
-                  AddressFormattingService.formatAddress(address),
-                  style: text.smallParagraph?.copyWith(color: colors.textSecondary, fontWeight: FontWeight.w500),
-                  overflow: TextOverflow.ellipsis,
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-Future<String?> showAddressPickerSheet(BuildContext context) {
-  return BottomSheetContainer.show<String>(context, builder: (_) => const AddressPickerSheet());
-}
diff --git a/mobile-app/lib/v2/screens/send/input_amount_screen.dart b/mobile-app/lib/v2/screens/send/input_amount_screen.dart
new file mode 100644
index 000000000..5d648218a
--- /dev/null
+++ b/mobile-app/lib/v2/screens/send/input_amount_screen.dart
@@ -0,0 +1,546 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/models/fiat_currency.dart';
+import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/providers/currency_display_provider.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/send/review_send_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/send/send_providers.dart';
+import 'package:resonance_network_wallet/v2/screens/send/send_screen_logic.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
+import 'package:resonance_network_wallet/shared/utils/debouncer.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_icon_button.dart';
+
+class InputAmountScreen extends ConsumerStatefulWidget {
+  final String recipientAddress;
+  final String? recipientChecksum;
+  final String? initialAmount;
+  final bool isPayMode;
+
+  const InputAmountScreen({
+    super.key,
+    required this.recipientAddress,
+    this.recipientChecksum,
+    this.initialAmount,
+    this.isPayMode = false,
+  });
+
+  @override
+  ConsumerState<InputAmountScreen> createState() => _InputAmountScreenState();
+}
+
+class _InputAmountScreenState extends ConsumerState<InputAmountScreen> {
+  final _amountController = TextEditingController();
+  final _amountFocus = FocusNode();
+  final _scrollController = ScrollController();
+  final _amountCenterKey = GlobalKey();
+  final _checksumService = HumanReadableChecksumService();
+
+  final _feeDebouncer = Debouncer(delay: const Duration(milliseconds: 500));
+
+  String? _recipientChecksum;
+  BigInt _amount = BigInt.zero;
+  BigInt _networkFee = BigInt.zero;
+  int _blockHeight = 0;
+  bool _isFetchingFee = true;
+
+  LocaleNumberConfig get _localeConfig => ref.read(localeNumberConfigProvider);
+
+  @override
+  void initState() {
+    super.initState();
+    assert(widget.recipientAddress.trim().isNotEmpty, 'InputAmountScreen requires a recipient');
+    _amountFocus.addListener(_onAmountFocusChanged);
+    if (widget.initialAmount != null) {
+      final isFlipped = ref.read(isCurrencyFlippedProvider);
+      final formattingService = ref.read(numberFormattingServiceProvider);
+      if (!isFlipped) {
+        final parsed = formattingService.parseAmount(widget.initialAmount!);
+        _amount = parsed ?? BigInt.zero;
+        _amountController.text = widget.initialAmount!;
+      } else {
+        final parsed = formattingService.parseAmount(widget.initialAmount!);
+        if (parsed != null && parsed > BigInt.zero) {
+          _amount = parsed;
+          _amountController.text = _quanToFiatString(parsed);
+        }
+      }
+    }
+    if (widget.recipientChecksum != null) {
+      _recipientChecksum = widget.recipientChecksum;
+    } else {
+      _checksumService.getHumanReadableName(widget.recipientAddress.trim()).then((name) {
+        if (mounted) setState(() => _recipientChecksum = name);
+      });
+    }
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _fetchEstimatedFee();
+    });
+  }
+
+  @override
+  void dispose() {
+    _feeDebouncer.cancel();
+    _amountController.dispose();
+    _amountFocus.removeListener(_onAmountFocusChanged);
+    _amountFocus.dispose();
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  void _onAmountFocusChanged() {
+    if (!_amountFocus.hasFocus) return;
+    // Wait for the keyboard animation to finish before scrolling so that the
+    // viewport has already shrunk and ensureVisible can compute the correct offset.
+    Future.delayed(const Duration(milliseconds: 300), () {
+      if (!mounted) return;
+      final ctx = _amountCenterKey.currentContext;
+      if (ctx != null) {
+        Scrollable.ensureVisible(
+          // ignore: use_build_context_synchronously
+          ctx,
+          alignment: 0.5,
+          duration: const Duration(milliseconds: 250),
+          curve: Curves.easeInOut,
+        );
+      }
+    });
+  }
+
+  void _onAmountChanged(String _) {
+    final isFlipped = ref.read(isCurrencyFlippedProvider);
+    if (isFlipped) {
+      try {
+        final convertedAmount = _fiatStringToQuan(_amountController.text);
+        setState(() => _amount = convertedAmount);
+      } on InvalidNumberInputException catch (e, stack) {
+        debugPrint('Fiat→QUAN parse failed: $e\n$stack');
+        context.showErrorToaster(message: 'Please enter a valid amount');
+        return;
+      }
+    } else {
+      final formattingService = ref.read(numberFormattingServiceProvider);
+      final parsed = formattingService.parseAmount(_amountController.text);
+      setState(() => _amount = parsed ?? BigInt.zero);
+    }
+    if (_amount > BigInt.zero) _feeDebouncer.run(_fetchFee);
+  }
+
+  Future<void> _fetchEstimatedFee() async {
+    final displayAccount = ref.read(activeAccountProvider).value;
+    if (displayAccount is! RegularAccount) return;
+    final account = displayAccount.account;
+    try {
+      final balancesService = ref.read(balancesServiceProvider);
+      final formattingService = ref.read(numberFormattingServiceProvider);
+      final feeData = await balancesService.getBalanceTransferFee(
+        account,
+        account.accountId,
+        formattingService.parseAmount('1000') ?? BigInt.zero,
+      );
+      if (!mounted) return;
+      setState(() {
+        _networkFee = feeData.fee;
+        _blockHeight = feeData.blockNumber;
+      });
+    } catch (e) {
+      debugPrint('Estimated fee fetch error: $e');
+    } finally {
+      if (mounted) setState(() => _isFetchingFee = false);
+    }
+  }
+
+  Future<void> _fetchFee() async {
+    if (_isFetchingFee) return;
+    setState(() => _isFetchingFee = true);
+    try {
+      final displayAccount = ref.read(activeAccountProvider).value;
+      if (displayAccount is! RegularAccount) return;
+      final balancesService = ref.read(balancesServiceProvider);
+      final feeData = await balancesService.getBalanceTransferFee(
+        displayAccount.account,
+        widget.recipientAddress.trim(),
+        _amount,
+      );
+      if (!mounted) return;
+      setState(() {
+        _networkFee = feeData.fee;
+        _blockHeight = feeData.blockNumber;
+      });
+    } catch (e) {
+      debugPrint('Fee fetch error: $e');
+    } finally {
+      if (mounted) setState(() => _isFetchingFee = false);
+    }
+  }
+
+  /// Converts a raw QUAN [BigInt] to a fiat input string using the current
+  /// exchange rate and selected fiat currency, formatted for the user's locale.
+  String _quanToFiatString(BigInt quanAmount) {
+    final xRate = ref.read(exchangeRateServiceProvider);
+    final selectedFiat = ref.read(selectedFiatCurrencyProvider);
+    final fiatValue = xRate.quanRawToFiat(quanAmount, selectedFiat, AppConstants.decimals);
+    final canonical = fiatValue.toStringAsFixed(selectedFiat.decimals);
+    return _localeConfig.localize(canonical, addGroupingSeparators: false);
+  }
+
+  /// Parses a locale-formatted fiat input string and returns the equivalent
+  /// raw QUAN [BigInt] scaled by [AppConstants.decimals].
+  ///
+  /// Throws [InvalidNumberInputException] when [fiatText] cannot be parsed.
+  BigInt _fiatStringToQuan(String fiatText) {
+    if (fiatText.isEmpty) return BigInt.zero;
+    final fiatDecimal = _localeConfig.parseDecimal(fiatText);
+    final xRate = ref.read(exchangeRateServiceProvider);
+    final selectedFiat = ref.read(selectedFiatCurrencyProvider);
+    return xRate.fiatToQuanRaw(fiatDecimal, selectedFiat, AppConstants.decimals);
+  }
+
+  void _setMax() {
+    final balance = ref.read(effectiveMaxBalanceProvider).value ?? BigInt.zero;
+    final max = SendScreenLogic.calculateMaxSendableAmount(balance: balance, networkFee: _networkFee);
+    final isFlipped = ref.read(isCurrencyFlippedProvider);
+    final formattingService = ref.read(numberFormattingServiceProvider);
+    _amountController.text = isFlipped
+        ? _quanToFiatString(max)
+        : formattingService.formatBalance(max, maxDecimals: AppConstants.decimals, addThousandsSeparators: false);
+    setState(() => _amount = max);
+    if (max > BigInt.zero) _fetchFee();
+  }
+
+  Future<void> _toggleFlip() async {
+    final wasFlipped = ref.read(isCurrencyFlippedProvider);
+    await ref.read(isCurrencyFlippedProvider.notifier).toggle();
+    final formattingService = ref.read(numberFormattingServiceProvider);
+
+    // Anchor the amount to the current primary value before flipping.
+    // If we were in fiat mode, the 'canonical' amount is the fiat value.
+    // If we were in QUAN mode, the 'canonical' amount is the QUAN value.
+    if (wasFlipped) {
+      // Fiat -> QUAN: The user was looking at a fiat amount.
+      // We already have _amount which was calculated from that fiat amount.
+      // No change needed to _amount, just update the controller.
+      _amountController.text = _amount == BigInt.zero
+          ? ''
+          : formattingService.formatBalance(_amount, maxDecimals: AppConstants.decimals, addThousandsSeparators: false);
+    } else {
+      // QUAN -> Fiat: re-parse _amount from the rounded fiat string so
+      // the displayed value and _amount stay in sync.
+      _amountController.text = _amount == BigInt.zero ? '' : _quanToFiatString(_amount);
+      if (_amount != BigInt.zero) {
+        _amount = _fiatStringToQuan(_amountController.text);
+      }
+    }
+  }
+
+  Future<void> _openReview() async {
+    if (_recipientChecksum == null) {
+      context.showErrorToaster(message: 'Recipient checksum is required');
+      return;
+    }
+
+    FocusScope.of(context).unfocus();
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (_) => ReviewSendScreen(
+          recipientAddress: widget.recipientAddress,
+          amount: _amount,
+          networkFee: _networkFee,
+          blockHeight: _blockHeight,
+          recipientChecksum: _recipientChecksum!,
+          isPayMode: widget.isPayMode,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    ref.watch(activeAccountProvider);
+    final colors = context.colors;
+    final text = context.themeText;
+    final balance = ref.watch(effectiveMaxBalanceProvider);
+    final activeId = ref.watch(activeAccountProvider).value?.account.accountId ?? '';
+    final recipient = widget.recipientAddress.trim();
+    final formattingService = ref.read(numberFormattingServiceProvider);
+
+    final amountStatus = SendScreenLogic.getAmountStatus(_amount, balance.value ?? BigInt.zero, _networkFee);
+    final btnDisabled =
+        _isFetchingFee ||
+        _recipientChecksum == null ||
+        SendScreenLogic.isButtonDisabled(
+          hasAddressError: false,
+          amountStatus: amountStatus,
+          recipientText: recipient,
+          activeAccountId: activeId,
+        );
+    final btnText = SendScreenLogic.getButtonText(
+      hasAddressError: false,
+      amountStatus: amountStatus,
+      recipientText: recipient,
+      amount: _amount,
+      activeAccountId: activeId,
+      formattingService: formattingService,
+    );
+
+    return ScaffoldBase(
+      appBar: V2AppBar(title: widget.isPayMode ? 'Pay' : 'Send'),
+      mainContent: LayoutBuilder(
+        builder: (context, constraints) => SingleChildScrollView(
+          controller: _scrollController,
+          child: ConstrainedBox(
+            constraints: BoxConstraints(minHeight: constraints.maxHeight),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              crossAxisAlignment: CrossAxisAlignment.stretch,
+              children: [
+                _recipientCard(colors, text),
+                const SizedBox(height: 32),
+                _amountCenter(colors, text),
+                const SizedBox(height: 32),
+                const SizedBox.shrink(),
+              ],
+            ),
+          ),
+        ),
+      ),
+      bottomContent: _bottomSection(colors, text, btnText, balance, btnDisabled),
+    );
+  }
+
+  Widget _recipientCard(AppColorsV2 colors, AppTextTheme text) {
+    final addr = widget.recipientAddress.trim();
+    final shortAddr = AddressFormattingService.formatAddress(addr);
+
+    return Container(
+      padding: const EdgeInsets.symmetric(vertical: 24, horizontal: 20),
+      decoration: BoxDecoration(color: colors.surfaceDeep, borderRadius: BorderRadius.circular(14)),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text('SEND TO', style: context.themeText.receiveLabel?.copyWith(color: colors.textLabel)),
+                const SizedBox(height: 16),
+                if (_recipientChecksum != null) ...[
+                  Text(
+                    _recipientChecksum!,
+                    style: text.smallParagraph?.copyWith(color: colors.checksum, height: 1.2),
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  const SizedBox(height: 4),
+                ],
+                Text(
+                  shortAddr,
+                  style: text.detail?.copyWith(
+                    color: colors.textMuted,
+                    fontFamily: AppTextTheme.fontFamilySecondary,
+                    fontSize: 12,
+                  ),
+                ),
+              ],
+            ),
+          ),
+          const SizedBox(width: 12),
+          Material(
+            color: colors.background,
+            shape: const CircleBorder(),
+            child: InkWell(
+              customBorder: const CircleBorder(),
+              onTap: () => Navigator.of(context).pop(true),
+              child: Container(
+                width: 36,
+                height: 36,
+                alignment: Alignment.center,
+                decoration: BoxDecoration(
+                  shape: BoxShape.circle,
+                  border: Border.all(color: colors.borderButton),
+                ),
+                child: Icon(Icons.edit_outlined, size: 18, color: colors.textPrimary),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _amountCenter(AppColorsV2 colors, AppTextTheme text) {
+    final isFlipped = ref.watch(isCurrencyFlippedProvider);
+    final selectedFiat = ref.watch(selectedFiatCurrencyProvider);
+    final localeConfig = ref.watch(localeNumberConfigProvider);
+    final display = ref.watch(txAmountDisplayProvider)(
+      _amount,
+      withSignPrefix: false,
+      quanDecimals: 4,
+      isSend: true,
+      withQuanSymbol: false,
+    );
+
+    final symbolStyle = text.transactionDetailAmountSymbol?.copyWith(color: colors.textPrimary);
+    final isPrefixFiat = isFlipped && selectedFiat.symbolPosition == SymbolPosition.prefix;
+
+    final maxDecimals = isFlipped ? selectedFiat.decimals : null;
+    final inputField = IntrinsicWidth(
+      child: TextField(
+        controller: _amountController,
+        focusNode: _amountFocus,
+        onChanged: _onAmountChanged,
+        keyboardType: const TextInputType.numberWithOptions(decimal: true),
+        textAlign: isPrefixFiat ? TextAlign.left : TextAlign.right,
+        inputFormatters: [DecimalInputFilter(localeConfig: localeConfig, maxDecimalPlaces: maxDecimals)],
+        style: text.transactionDetailAmountPrimary?.copyWith(
+          color: _amount == BigInt.zero ? colors.textTertiary : colors.textPrimary,
+        ),
+        decoration: InputDecoration(
+          isDense: true,
+          hintText: '0',
+          hintStyle: text.transactionDetailAmountPrimary?.copyWith(color: colors.textTertiary),
+        ),
+      ),
+    );
+
+    final symbolWidget = Text(isFlipped ? selectedFiat.symbol : AppConstants.tokenSymbol, style: symbolStyle);
+
+    // For prefix fiat currencies (e.g. $, Rp) place symbol before the field;
+    // for suffix currencies and QUAN keep it after.
+    final List<Widget> primaryRowChildren = isPrefixFiat
+        ? [symbolWidget, const SizedBox(width: 8), inputField]
+        : [inputField, const SizedBox(width: 8), symbolWidget];
+
+    return Center(
+      key: _amountCenterKey,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          SingleChildScrollView(
+            scrollDirection: Axis.horizontal,
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.end,
+              children: primaryRowChildren,
+            ),
+          ),
+          const SizedBox(height: 16),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(
+                '≈ ${display.secondaryAmount}',
+                style: text.paragraph?.copyWith(
+                  color: colors.textTertiary,
+                  fontFamily: AppTextTheme.fontFamilySecondary,
+                ),
+              ),
+              const SizedBox(width: 8),
+              QuantusIconButton.circular(
+                icon: Icons.swap_vert,
+                onTap: _toggleFlip,
+                isActive: display.isFlipped,
+                size: IconButtonSize.small,
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _bottomSection(
+    AppColorsV2 colors,
+    AppTextTheme text,
+    String btnText,
+    AsyncValue<BigInt> balance,
+    bool btnDisabled,
+  ) {
+    final formattingService = ref.read(numberFormattingServiceProvider);
+
+    return ScaffoldBaseBottomContent(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text('Available Balance:', style: text.smallParagraph?.copyWith(color: colors.textTertiary)),
+                        const SizedBox(height: 4),
+                        balance.when(
+                          data: (b) => Text(
+                            '${formattingService.formatBalance(b)} ${AppConstants.tokenSymbol}',
+                            style: text.smallParagraph?.copyWith(color: colors.textTertiary),
+                          ),
+                          loading: () => Text('...', style: text.smallParagraph?.copyWith(color: colors.textTertiary)),
+                          error: (_, _) => Text('—', style: text.smallParagraph?.copyWith(color: colors.textTertiary)),
+                        ),
+                      ],
+                    ),
+                  ),
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.end,
+                      children: [
+                        Text('Network Fee:', style: text.smallParagraph?.copyWith(color: colors.textTertiary)),
+                        const SizedBox(height: 4),
+                        if (!_isFetchingFee)
+                          Text(
+                            '${formattingService.formatBalance(_networkFee, maxDecimals: 5)} ${AppConstants.tokenSymbol}',
+                            style: text.smallParagraph?.copyWith(color: colors.textTertiary),
+                          )
+                        else
+                          const Loader(),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 4),
+              IntrinsicWidth(
+                child: QuantusButton.simple(
+                  label: 'Max',
+                  onTap: _setMax,
+                  padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 0),
+                  variant: ButtonVariant.transparent,
+                  textStyle: text.smallParagraph?.copyWith(
+                    color: colors.accentOrange,
+                    decoration: TextDecoration.underline,
+                    decorationColor: colors.accentOrange,
+                  ),
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 32),
+          QuantusButton.simple(
+            label: btnText,
+            variant: ButtonVariant.primary,
+            isDisabled: btnDisabled,
+            onTap: _openReview,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/send/review_send_screen.dart b/mobile-app/lib/v2/screens/send/review_send_screen.dart
new file mode 100644
index 000000000..4b40fc5f4
--- /dev/null
+++ b/mobile-app/lib/v2/screens/send/review_send_screen.dart
@@ -0,0 +1,237 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/providers/currency_display_provider.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
+import 'package:resonance_network_wallet/services/local_auth_service.dart';
+import 'package:resonance_network_wallet/services/transaction_submission_service.dart';
+import 'package:resonance_network_wallet/v2/components/address_checkphrase_with_initial.dart';
+import 'package:resonance_network_wallet/v2/components/amount_display_with_conversion.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/components/split_card.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/send/tx_submitted_screen.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class ReviewSendScreen extends ConsumerStatefulWidget {
+  final String recipientAddress;
+  final BigInt amount;
+  final BigInt networkFee;
+  final int blockHeight;
+  final String recipientChecksum;
+  final bool isPayMode;
+
+  const ReviewSendScreen({
+    super.key,
+    required this.recipientAddress,
+    required this.amount,
+    required this.networkFee,
+    required this.blockHeight,
+    required this.recipientChecksum,
+    this.isPayMode = false,
+  });
+
+  @override
+  ConsumerState<ReviewSendScreen> createState() => _ReviewSendScreenState();
+}
+
+class _ReviewSendScreenState extends ConsumerState<ReviewSendScreen> {
+  bool _submitting = false;
+  String? _errorMessage;
+
+  Future<void> _toggleFlip() async {
+    await ref.read(isCurrencyFlippedProvider.notifier).toggle();
+  }
+
+  Future<void> _confirmSend() async {
+    setState(() {
+      _submitting = true;
+      _errorMessage = null;
+    });
+
+    final authed = await LocalAuthService().authenticate(localizedReason: 'Authenticate to confirm transaction');
+    if (!authed || !mounted) {
+      setState(() {
+        _submitting = false;
+        _errorMessage = 'Authentication required to send';
+      });
+      return;
+    }
+
+    try {
+      final settings = SettingsService();
+      final account = (await settings.getActiveRegularAccount())!;
+      final submissionService = ref.read(transactionSubmissionServiceProvider);
+      await submissionService.balanceTransfer(
+        account,
+        widget.recipientAddress.trim(),
+        widget.amount,
+        widget.networkFee,
+        widget.blockHeight,
+      );
+      unawaited(
+        RecentAddressesService()
+            .addAddress(widget.recipientAddress.trim())
+            .catchError((Object e) => debugPrint('Failed to save recent address: $e')),
+      );
+      setState(() {
+        _submitting = false;
+        _errorMessage = null;
+      });
+
+      if (mounted) {
+        Navigator.push(
+          context,
+          MaterialPageRoute(
+            builder: (_) => TxSubmittedScreen(
+              amount: widget.amount,
+              recipientAddress: widget.recipientAddress,
+              recipientChecksum: widget.recipientChecksum,
+              isPayMode: widget.isPayMode,
+            ),
+          ),
+        );
+      }
+    } catch (e) {
+      debugPrint('Transfer failed: $e');
+
+      if (mounted) {
+        setState(() {
+          _submitting = false;
+          _errorMessage = 'Failed submitting transaction';
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    ref.watch(activeAccountProvider);
+    final colors = context.colors;
+    final text = context.themeText;
+    final addr = widget.recipientAddress.trim();
+    final approxDisplay = ref.watch(txAmountDisplayProvider)(
+      widget.amount,
+      isSend: true,
+      withSignPrefix: false,
+      withQuanSymbol: false,
+      quanDecimals: 4,
+    );
+    final totalRaw = widget.amount + widget.networkFee;
+
+    return ScaffoldBase(
+      appBar: V2AppBar(title: widget.isPayMode ? 'Pay' : 'Send'),
+      mainContent: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              _heroCard(colors, text, approxDisplay),
+              const SizedBox(height: 28),
+              _summarySection(addr, totalRaw),
+              if (_errorMessage != null) ...[
+                const SizedBox(height: 16),
+                Text(_errorMessage!, style: text.detail?.copyWith(color: colors.textError)),
+              ],
+            ],
+          ),
+        ],
+      ),
+      bottomContent: ScaffoldBaseBottomContent(
+        child: QuantusButton.simple(
+          label: 'Confirm',
+          variant: ButtonVariant.primary,
+          isLoading: _submitting,
+          isDisabled: _submitting,
+          onTap: _confirmSend,
+        ),
+      ),
+    );
+  }
+
+  Widget _heroCard(AppColorsV2 colors, AppTextTheme text, CurrencyDisplayState approxDisplay) {
+    final sectionLabelStyle = text.receiveLabel?.copyWith(color: colors.textLabel);
+
+    return SplitCard(
+      topChild: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text('SENDING', style: sectionLabelStyle),
+          const SizedBox(height: 16),
+          AmountDisplayWithConversion(
+            amountDisplay: approxDisplay,
+            alignment: CrossAxisAlignment.start,
+            onFlip: _toggleFlip,
+          ),
+        ],
+      ),
+      bottomChild: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text('TO', style: sectionLabelStyle),
+          const SizedBox(height: 16),
+          AddressCheckphraseWithInitial(
+            recipientChecksum: widget.recipientChecksum,
+            recipientAddress: widget.recipientAddress,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _summarySection(String addr, BigInt totalRaw) {
+    final shownDecimals = AppConstants.decimals;
+    final shortAddr = AddressFormattingService.formatAddress(addr);
+    final formattingService = ref.watch(numberFormattingServiceProvider);
+
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        const SizedBox(height: 7),
+        _summaryRow(label: 'TO', value: shortAddr),
+        const SizedBox(height: 7),
+        _summaryRow(
+          label: 'AMOUNT',
+          value:
+              '${formattingService.formatBalance(widget.amount, maxDecimals: shownDecimals)} ${AppConstants.tokenSymbol}',
+        ),
+        const SizedBox(height: 7),
+        _summaryRow(
+          label: 'NETWORK FEE',
+          value:
+              '${formattingService.formatBalance(widget.networkFee, maxDecimals: shownDecimals)} ${AppConstants.tokenSymbol}',
+        ),
+        const SizedBox(height: 7),
+        _summaryRow(
+          label: 'YOU PAY',
+          value: '${formattingService.formatBalance(totalRaw, maxDecimals: shownDecimals)} ${AppConstants.tokenSymbol}',
+        ),
+        const SizedBox(height: 7),
+      ],
+    );
+  }
+
+  Widget _summaryRow({required String label, required String value}) {
+    final labelStyle = context.themeText.transactionDetailRowLabel?.copyWith(color: context.colors.textTertiary);
+    final valueStyle = context.themeText.transactionDetailRowLabel;
+
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Expanded(child: Text(label, style: labelStyle)),
+        const SizedBox(width: 8),
+        Flexible(
+          child: Text(value, style: valueStyle, textAlign: TextAlign.right),
+        ),
+      ],
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/send/select_recipient_screen.dart b/mobile-app/lib/v2/screens/send/select_recipient_screen.dart
new file mode 100644
index 000000000..477654824
--- /dev/null
+++ b/mobile-app/lib/v2/screens/send/select_recipient_screen.dart
@@ -0,0 +1,388 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/features/components/dotted_border.dart';
+import 'package:resonance_network_wallet/features/components/skeleton.dart';
+import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/providers/route_intent_providers.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
+import 'package:resonance_network_wallet/v2/components/address_checkphrase_with_initial.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/qr_scanner_page.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/send/input_amount_screen.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class SelectRecipientScreen extends ConsumerStatefulWidget {
+  const SelectRecipientScreen({super.key});
+
+  @override
+  ConsumerState<SelectRecipientScreen> createState() => _SelectRecipientScreenState();
+}
+
+class _SelectRecipientScreenState extends ConsumerState<SelectRecipientScreen> {
+  final _amountController = TextEditingController();
+  final _recipientController = TextEditingController();
+  final _recipientFocus = FocusNode();
+
+  final Map<String, String> _checksums = {};
+  List<String> _recents = [];
+  bool _hasAddressError = true;
+  bool _loadingRecents = true;
+  bool _isPayMode = false;
+  String? _recipientChecksum;
+
+  @override
+  void initState() {
+    super.initState();
+    _recipientController.addListener(_onRecipientChanged);
+    _loadRecents();
+  }
+
+  @override
+  void dispose() {
+    _recipientController.removeListener(_onRecipientChanged);
+    _recipientController.dispose();
+    _amountController.dispose();
+    _recipientFocus.dispose();
+    super.dispose();
+  }
+
+  Future<void> _loadRecents() async {
+    final checksumService = ref.read(humanReadableChecksumServiceProvider);
+    final settingsService = ref.read(settingsServiceProvider);
+    final recentAddressesService = ref.read(recentAddressesServiceProvider);
+
+    try {
+      final all = await recentAddressesService.getAddresses();
+      final active = await settingsService.getActiveAccount();
+      final currentId = active?.account.accountId;
+      final addresses = all.where((a) => a != currentId).toList();
+      if (!mounted) return;
+      setState(() {
+        _recents = addresses;
+        _loadingRecents = false;
+      });
+      for (final addr in addresses) {
+        checksumService.getHumanReadableName(addr).then((name) {
+          if (mounted) setState(() => _checksums[addr] = name);
+        });
+      }
+    } catch (e) {
+      debugPrint('SelectRecipientScreen recents: $e');
+      if (mounted) setState(() => _loadingRecents = false);
+    }
+  }
+
+  void _onRecipientChanged() {
+    final text = _recipientController.text.trim();
+    if (text.isEmpty) {
+      _amountController.clear();
+      setState(() {
+        _hasAddressError = true;
+        _recipientChecksum = null;
+        _isPayMode = false;
+      });
+      return;
+    }
+    _lookupAddress(text);
+  }
+
+  void _lookupAddress(String address) {
+    final checksumService = ref.read(humanReadableChecksumServiceProvider);
+    final substrate = ref.read(substrateServiceProvider);
+    final isValid = substrate.isValidSS58Address(address);
+    setState(() {
+      _hasAddressError = !isValid;
+      _recipientChecksum = null;
+    });
+    if (isValid) {
+      checksumService.getHumanReadableName(address).then((checksum) {
+        if (mounted) setState(() => _recipientChecksum = checksum);
+      });
+    }
+  }
+
+  bool get _canContinue {
+    final text = _recipientController.text.trim();
+    if (text.isEmpty) return false;
+    if (_hasAddressError) return false;
+    final activeId = ref.read(activeAccountProvider).value?.account.accountId ?? '';
+    if (text == activeId) return false;
+    return true;
+  }
+
+  Future<void> _scanQr() async {
+    final substrate = ref.read(substrateServiceProvider);
+    final scanResult = await Navigator.push<String>(
+      context,
+      MaterialPageRoute(
+        fullscreenDialog: true,
+        builder: (_) => QrScannerPage(
+          validator: (code) => substrate.isValidSS58Address(code) || PaymentIntent.tryParseUrl(code) != null,
+        ),
+      ),
+    );
+    if (scanResult == null || !mounted) return;
+    final payment = PaymentIntent.tryParseUrl(scanResult);
+    if (payment != null) {
+      setState(() {
+        _recipientController.text = payment.to;
+        _amountController.text = payment.amount;
+        _isPayMode = true;
+      });
+    } else {
+      setState(() {
+        _recipientController.text = scanResult;
+        _isPayMode = false;
+      });
+    }
+  }
+
+  void _continue() {
+    if (!_canContinue) return;
+
+    final address = _recipientController.text.trim();
+    Navigator.push<bool>(
+      context,
+      MaterialPageRoute(
+        builder: (_) => InputAmountScreen(
+          recipientAddress: address,
+          recipientChecksum: _recipientChecksum,
+          initialAmount: _amountController.text,
+          isPayMode: _isPayMode,
+        ),
+      ),
+    ).then((popped) {
+      if (!mounted || popped != true) return;
+      _recipientController.clear();
+      _amountController.clear();
+      _isPayMode = false;
+
+      setState(() {
+        _recipientChecksum = null;
+        _hasAddressError = true;
+      });
+    });
+  }
+
+  void _onRecentTap(String address) {
+    _amountController.clear();
+    setState(() => _isPayMode = false);
+    _recipientController.text = address;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    ref.watch(activeAccountProvider);
+    final colors = context.colors;
+    final text = context.themeText;
+
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Send'),
+      mainContent: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              Text('Send To', style: text.sendSectionLabel?.copyWith(color: colors.textPrimary)),
+              const SizedBox(height: 12),
+              _buildRecipientField(colors, text),
+              const SizedBox(height: 28),
+              _buildScanRow(colors, text),
+              const SizedBox(height: 28),
+              DottedBorder(
+                dashLength: 3,
+                gapLength: 5,
+                color: colors.borderButton.useOpacity(0.5),
+                child: const SizedBox(width: double.infinity, height: 1),
+              ),
+              const SizedBox(height: 28),
+            ],
+          ),
+          Expanded(
+            child: CustomScrollView(
+              keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
+              slivers: [
+                if (_loadingRecents)
+                  const SliverFillRemaining(hasScrollBody: false, child: Center(child: Loader()))
+                else if (_recents.isNotEmpty) ...[
+                  SliverToBoxAdapter(
+                    child: Text('Recents', style: text.smallTitle?.copyWith(color: colors.textPrimary)),
+                  ),
+                  const SliverToBoxAdapter(child: SizedBox(height: 32)),
+                  SliverList(
+                    delegate: SliverChildBuilderDelegate((context, i) {
+                      final isFirst = i == 0;
+                      final isLast = i == _recents.length - 1;
+                      return Column(
+                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          if (!isFirst) ...[const SizedBox(height: 14)],
+                          _recentRow(_recents[i], colors, text),
+                          if (!isLast) ...[
+                            const SizedBox(height: 14),
+                            Divider(height: 1, color: colors.txItemSeparator),
+                          ],
+                        ],
+                      );
+                    }, childCount: _recents.length),
+                  ),
+                ] else
+                  const SliverFillRemaining(hasScrollBody: false, child: SizedBox.shrink()),
+              ],
+            ),
+          ),
+        ],
+      ),
+      bottomContent: _buildBottomButton(),
+    );
+  }
+
+  Widget _buildRecipientField(AppColorsV2 colors, AppTextTheme text) {
+    final hasValid = _recipientController.text.trim().isNotEmpty && !_hasAddressError;
+
+    return SizedBox(
+      height: 48,
+      child: Stack(
+        children: [
+          Positioned.fill(
+            child: IgnorePointer(
+              ignoring: hasValid,
+              child: Opacity(
+                opacity: hasValid ? 0 : 1,
+                child: Container(
+                  padding: const EdgeInsets.only(left: 12, right: 8),
+                  decoration: BoxDecoration(color: colors.sheetBackground, borderRadius: BorderRadius.circular(8)),
+                  child: Row(
+                    children: [
+                      Icon(Icons.search, size: 14, color: colors.textLabel),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: TextField(
+                          controller: _recipientController,
+                          focusNode: _recipientFocus,
+                          keyboardType: TextInputType.text,
+                          textInputAction: TextInputAction.done,
+                          autocorrect: false,
+                          enableSuggestions: false,
+                          textCapitalization: TextCapitalization.none,
+                          scrollPadding: const EdgeInsets.only(bottom: 120),
+                          style: text.smallParagraph?.copyWith(color: colors.textPrimary),
+                          decoration: const InputDecoration(hintText: 'Search ${AppConstants.tokenSymbol} Address'),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+          if (hasValid)
+            Positioned.fill(
+              child: GestureDetector(
+                onTap: () {
+                  _recipientController.clear();
+                  _recipientFocus.requestFocus();
+                },
+                child: Container(
+                  padding: const EdgeInsets.symmetric(horizontal: 12),
+                  decoration: BoxDecoration(color: colors.toasterBackground, borderRadius: BorderRadius.circular(8)),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      Text(
+                        AddressFormattingService.formatAddress(_recipientController.text.trim()),
+                        style: text.smallParagraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w500),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                      if (_recipientChecksum != null)
+                        Text(_recipientChecksum!, style: text.detail?.copyWith(color: colors.checksum)),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildScanRow(AppColorsV2 colors, AppTextTheme text) {
+    final iconContainerSize = 44.0;
+    final iconSize = 24.0;
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: _scanQr,
+        borderRadius: BorderRadius.circular(12),
+        child: Row(
+          children: [
+            Container(
+              width: iconContainerSize,
+              height: iconContainerSize,
+              decoration: BoxDecoration(
+                color: colors.background,
+                borderRadius: BorderRadius.circular(36),
+                border: Border.all(color: colors.borderButton),
+              ),
+              child: Icon(Icons.qr_code_scanner, size: iconSize, color: colors.textPrimary),
+            ),
+            const SizedBox(width: 16),
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text('Scan QR code', style: text.paragraph?.copyWith(color: colors.textPrimary)),
+                  const SizedBox(height: 4),
+                  Text(
+                    'Tap to scan a ${AppConstants.tokenSymbol} Address',
+                    style: text.detail?.copyWith(color: colors.textTertiary),
+                  ),
+                ],
+              ),
+            ),
+            Icon(Icons.chevron_right, size: 20, color: colors.textPrimary),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _recentRow(String address, AppColorsV2 colors, AppTextTheme text) {
+    final checksum = _checksums[address];
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: () => _onRecentTap(address),
+        borderRadius: BorderRadius.circular(8),
+        child: checksum != null
+            ? AddressCheckphraseWithInitial(recipientChecksum: checksum, recipientAddress: address)
+            : const Skeleton(height: 36),
+      ),
+    );
+  }
+
+  Widget _buildBottomButton() {
+    final btnText = _canContinue ? 'Continue' : 'Enter Address';
+
+    return ScaffoldBaseBottomContent(
+      child: QuantusButton.simple(
+        label: btnText,
+        variant: ButtonVariant.primary,
+        isDisabled: !_canContinue,
+        onTap: _continue,
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/send/send_screen_logic.dart b/mobile-app/lib/v2/screens/send/send_screen_logic.dart
index fdce30078..31390e8fa 100644
--- a/mobile-app/lib/v2/screens/send/send_screen_logic.dart
+++ b/mobile-app/lib/v2/screens/send/send_screen_logic.dart
@@ -56,7 +56,7 @@ class SendScreenLogic {
       case AmountStatus.insufficientBalance:
         return 'Insufficient Balance';
       case AmountStatus.valid:
-        return 'Send ${formattingService.formatBalance(amount, addSymbol: true)}';
+        return 'Review Send';
     }
   }
 
diff --git a/mobile-app/lib/v2/screens/send/send_sheet.dart b/mobile-app/lib/v2/screens/send/send_sheet.dart
deleted file mode 100644
index 44e4f06a8..000000000
--- a/mobile-app/lib/v2/screens/send/send_sheet.dart
+++ /dev/null
@@ -1,575 +0,0 @@
-import 'dart:async';
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:resonance_network_wallet/v2/components/bottom_sheet_container.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/components/glass_icon_button.dart';
-import 'package:resonance_network_wallet/v2/components/qr_scanner_page.dart';
-import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/v2/screens/send/send_providers.dart';
-import 'package:resonance_network_wallet/v2/screens/send/send_screen_logic.dart';
-import 'package:resonance_network_wallet/providers/account_providers.dart';
-import 'package:resonance_network_wallet/providers/route_intent_providers.dart';
-import 'package:resonance_network_wallet/providers/wallet_providers.dart';
-import 'package:resonance_network_wallet/services/local_auth_service.dart';
-import 'package:resonance_network_wallet/services/transaction_submission_service.dart';
-import 'package:resonance_network_wallet/v2/components/success_check.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
-import 'package:resonance_network_wallet/v2/screens/send/address_picker_sheet.dart';
-
-enum _Step { form, confirm, sending, complete }
-
-class SendSheet extends ConsumerStatefulWidget {
-  final String? initialAddress;
-  final String? initialAmount;
-  final bool isPayMode;
-  const SendSheet({super.key, this.initialAddress, this.initialAmount, this.isPayMode = false});
-
-  @override
-  ConsumerState<SendSheet> createState() => _SendSheetState();
-}
-
-class _SendSheetState extends ConsumerState<SendSheet> {
-  final _recipientController = TextEditingController();
-  final _amountController = TextEditingController();
-  final _recipientFocus = FocusNode();
-  final _amountFocus = FocusNode();
-  final _fmt = NumberFormattingService();
-  final _checksumService = HumanReadableChecksumService();
-
-  _Step _step = _Step.form;
-  String? _recipientChecksum;
-  bool _hasAddressError = true;
-  BigInt _amount = BigInt.zero;
-  BigInt _networkFee = BigInt.zero;
-  int _blockHeight = 0;
-  bool _isFetchingFee = false;
-  String? _errorMessage;
-  double _formKbHeight = 0;
-  bool _kbOpen = false;
-  Timer? _kbTimer;
-
-  @override
-  void initState() {
-    super.initState();
-    _recipientController.addListener(_onRecipientChanged);
-    _amountController.addListener(_onAmountChanged);
-    if (widget.initialAddress != null) {
-      _recipientController.text = widget.initialAddress!;
-    }
-    if (widget.initialAmount != null) {
-      _amountController.text = widget.initialAmount!;
-    }
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      _fetchEstimatedFee();
-    });
-  }
-
-  @override
-  void dispose() {
-    _kbTimer?.cancel();
-    _recipientController.dispose();
-    _amountController.dispose();
-    _recipientFocus.dispose();
-    _amountFocus.dispose();
-    super.dispose();
-  }
-
-  void _onRecipientChanged() {
-    final text = _recipientController.text.trim();
-    if (text.isEmpty) {
-      setState(() {
-        _hasAddressError = true;
-        _recipientChecksum = null;
-      });
-      return;
-    }
-    _lookupAddress(text);
-  }
-
-  void _lookupAddress(String address) {
-    final substrate = ref.read(substrateServiceProvider);
-    final isValid = substrate.isValidSS58Address(address);
-    setState(() {
-      _hasAddressError = !isValid;
-      _recipientChecksum = null;
-    });
-    if (isValid) {
-      _checksumService.getHumanReadableName(address).then((checksum) {
-        if (mounted) setState(() => _recipientChecksum = checksum);
-      });
-      if (_amount > BigInt.zero) _fetchFee();
-    }
-  }
-
-  void _onAmountChanged() {
-    final parsed = _fmt.parseAmount(_amountController.text);
-    setState(() => _amount = parsed ?? BigInt.zero);
-    if (!_hasAddressError && _amount > BigInt.zero) _fetchFee();
-  }
-
-  Future<void> _fetchEstimatedFee() async {
-    final displayAccount = ref.read(activeAccountProvider).value;
-    if (displayAccount is! RegularAccount) return;
-    final account = displayAccount.account;
-    try {
-      final balancesService = ref.read(balancesServiceProvider);
-      final feeData = await balancesService.getBalanceTransferFee(
-        account,
-        account.accountId,
-        _fmt.parseAmount('1000') ?? BigInt.zero,
-      );
-      if (!mounted) return;
-      setState(() {
-        _networkFee = feeData.fee;
-        _blockHeight = feeData.blockNumber;
-      });
-    } catch (e) {
-      debugPrint('Estimated fee fetch error: $e');
-    }
-  }
-
-  Future<void> _fetchFee() async {
-    if (_isFetchingFee) return;
-    setState(() => _isFetchingFee = true);
-    try {
-      final displayAccount = ref.read(activeAccountProvider).value;
-      if (displayAccount is! RegularAccount) return;
-      final recipient = _recipientController.text.trim();
-      final balancesService = ref.read(balancesServiceProvider);
-      final feeData = await balancesService.getBalanceTransferFee(displayAccount.account, recipient, _amount);
-      if (!mounted) return;
-      setState(() {
-        _networkFee = feeData.fee;
-        _blockHeight = feeData.blockNumber;
-      });
-    } catch (e) {
-      debugPrint('Fee fetch error: $e');
-    } finally {
-      if (mounted) setState(() => _isFetchingFee = false);
-    }
-  }
-
-  void _setMax() {
-    final balance = ref.read(effectiveMaxBalanceProvider).value ?? BigInt.zero;
-    final max = SendScreenLogic.calculateMaxSendableAmount(balance: balance, networkFee: _networkFee);
-    _amountController.text = _fmt.formatBalance(max, maxDecimals: AppConstants.decimals, addThousandsSeparators: false);
-  }
-
-  Future<void> _scanQr() async {
-    final substrate = ref.read(substrateServiceProvider);
-    final scanResult = await Navigator.push<String>(
-      context,
-      MaterialPageRoute(
-        fullscreenDialog: true,
-        builder: (_) => QrScannerPage(
-          validator: (code) => substrate.isValidSS58Address(code) || PaymentIntent.tryParseUrl(code) != null,
-        ),
-      ),
-    );
-    // scanResult is either a valid address or a valid payment intent or null
-    if (scanResult == null || !mounted) return;
-    final payment = PaymentIntent.tryParseUrl(scanResult);
-    if (payment != null) {
-      _recipientController.text = payment.to;
-      _amountController.text = payment.amount;
-    } else {
-      _recipientController.text = scanResult;
-    }
-  }
-
-  Future<void> _pickRecent() async {
-    final address = await showAddressPickerSheet(context);
-    if (address != null && mounted) {
-      _recipientController.text = address;
-    }
-  }
-
-  void _review() {
-    FocusScope.of(context).unfocus();
-    setState(() => _step = _Step.confirm);
-  }
-
-  void _backToForm() => setState(() => _step = _Step.form);
-
-  Future<void> _confirmSend() async {
-    final authed = await LocalAuthService().authenticate(localizedReason: 'Authenticate to confirm transaction');
-    if (!authed || !mounted) {
-      if (mounted) setState(() => _errorMessage = 'Authentication required to send');
-      return;
-    }
-
-    setState(() {
-      _step = _Step.sending;
-      _errorMessage = null;
-    });
-    try {
-      final settings = SettingsService();
-      final account = (await settings.getActiveRegularAccount())!;
-      final submissionService = ref.read(transactionSubmissionServiceProvider);
-      await submissionService.balanceTransfer(
-        account,
-        _recipientController.text.trim(),
-        _amount,
-        _networkFee,
-        _blockHeight,
-      );
-      RecentAddressesService().addAddress(_recipientController.text.trim());
-      if (mounted) setState(() => _step = _Step.complete);
-    } catch (e) {
-      if (mounted) {
-        setState(() {
-          _step = _Step.confirm;
-          _errorMessage = 'Transfer failed: $e';
-        });
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final colors = context.colors;
-    final text = context.themeText;
-    final balance = ref.watch(effectiveMaxBalanceProvider);
-    final kb = MediaQuery.of(context).viewInsets.bottom;
-
-    double bottomPadding;
-    if (_step == _Step.form) {
-      if (kb > 0) {
-        _kbTimer?.cancel();
-        _kbOpen = true;
-        if (kb > _formKbHeight) _formKbHeight = kb;
-      } else if (_kbOpen) {
-        _kbTimer?.cancel();
-        _kbTimer = Timer(const Duration(milliseconds: 200), () {
-          if (mounted) {
-            setState(() {
-              _kbOpen = false;
-              _formKbHeight = 0;
-            });
-          }
-        });
-      }
-      bottomPadding = _formKbHeight;
-    } else {
-      _kbTimer?.cancel();
-      _kbOpen = false;
-      _formKbHeight = 0;
-      bottomPadding = kb;
-    }
-
-    return Padding(
-      padding: EdgeInsets.only(bottom: bottomPadding),
-      child: BottomSheetContainer(
-        title: widget.isPayMode ? 'Pay' : 'Send',
-        onBack: _step == _Step.confirm ? _backToForm : null,
-        child: switch (_step) {
-          _Step.form => _buildForm(colors, text, balance),
-          _Step.confirm => _buildConfirm(colors, text),
-          _Step.sending => _buildSending(colors, text),
-          _Step.complete => _buildComplete(colors, text),
-        },
-      ),
-    );
-  }
-
-  Widget _buildForm(AppColorsV2 colors, AppTextTheme text, AsyncValue<BigInt> balance) {
-    final recipient = _recipientController.text.trim();
-    final activeId = ref.watch(activeAccountProvider).value?.account.accountId ?? '';
-    final amountStatus = SendScreenLogic.getAmountStatus(_amount, balance.value ?? BigInt.zero, _networkFee);
-    final btnDisabled = SendScreenLogic.isButtonDisabled(
-      hasAddressError: _hasAddressError,
-      amountStatus: amountStatus,
-      recipientText: recipient,
-      activeAccountId: activeId,
-    );
-    final btnText = SendScreenLogic.getButtonText(
-      hasAddressError: _hasAddressError,
-      amountStatus: amountStatus,
-      recipientText: recipient,
-      amount: _amount,
-      activeAccountId: activeId,
-      formattingService: _fmt,
-    );
-
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text('Send To', style: text.smallParagraph?.copyWith(color: colors.textPrimary)),
-        const SizedBox(height: 12),
-        _addressInput(colors, text),
-        const SizedBox(height: 12),
-        Row(
-          children: [
-            _iconButton(Icons.qr_code_scanner, colors, _scanQr),
-            const SizedBox(width: 8),
-            _iconButton(Icons.history, colors, _pickRecent),
-          ],
-        ),
-        const SizedBox(height: 40),
-        _amountCard(colors, text, balance),
-        const SizedBox(height: 12),
-        _feeRow(colors, text),
-        const SizedBox(height: 8),
-        _actionButton(
-          label: btnText,
-          colors: colors,
-          text: text,
-          disabled: btnDisabled,
-          onTap: btnDisabled ? null : _review,
-        ),
-      ],
-    );
-  }
-
-  Widget _addressInput(AppColorsV2 colors, AppTextTheme text) {
-    final hasRecipient = _recipientController.text.trim().isNotEmpty && !_hasAddressError;
-    return SizedBox(
-      width: double.infinity,
-      height: 56,
-      child: Stack(
-        children: [
-          Positioned.fill(
-            child: IgnorePointer(
-              ignoring: hasRecipient,
-              child: Opacity(
-                opacity: hasRecipient ? 0 : 1,
-                child: Container(
-                  alignment: Alignment.center,
-                  padding: const EdgeInsets.only(left: 12, right: 8),
-                  decoration: BoxDecoration(color: colors.surfaceGlass, borderRadius: BorderRadius.circular(8)),
-                  child: TextField(
-                    controller: _recipientController,
-                    focusNode: _recipientFocus,
-                    keyboardType: TextInputType.text,
-                    textInputAction: TextInputAction.next,
-                    autocorrect: false,
-                    enableSuggestions: false,
-                    textCapitalization: TextCapitalization.none,
-                    scrollPadding: EdgeInsets.zero,
-                    textAlignVertical: TextAlignVertical.center,
-                    style: text.smallParagraph?.copyWith(color: colors.textPrimary),
-                    decoration: InputDecoration(
-                      filled: true,
-                      fillColor: Colors.transparent,
-                      isDense: true,
-                      contentPadding: EdgeInsets.zero,
-                      border: InputBorder.none,
-                      enabledBorder: InputBorder.none,
-                      focusedBorder: InputBorder.none,
-                      hintText: 'Quan Address',
-                      hintStyle: text.smallParagraph?.copyWith(color: colors.textTertiary),
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          ),
-          if (hasRecipient)
-            Positioned.fill(
-              child: GestureDetector(
-                onTap: () {
-                  _recipientController.clear();
-                  _recipientFocus.requestFocus();
-                },
-                child: Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 12),
-                  decoration: BoxDecoration(color: colors.surfaceGlass, borderRadius: BorderRadius.circular(8)),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      Text(
-                        AddressFormattingService.formatAddress(
-                          _recipientController.text.trim(),
-                          prefix: 15,
-                          ellipses: '.......',
-                          postFix: 14,
-                        ),
-                        style: text.smallParagraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w500),
-                        maxLines: 1,
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                      if (_recipientChecksum != null)
-                        Text(_recipientChecksum!, style: text.detail?.copyWith(color: colors.accentPink)),
-                    ],
-                  ),
-                ),
-              ),
-            ),
-        ],
-      ),
-    );
-  }
-
-  Widget _amountCard(AppColorsV2 colors, AppTextTheme text, AsyncValue<BigInt> balance) {
-    return SizedBox(
-      height: 120,
-      child: Stack(
-        children: [
-          Container(
-            width: double.infinity,
-            height: 120,
-            decoration: BoxDecoration(color: colors.surfaceGlass, borderRadius: BorderRadius.circular(14)),
-          ),
-          Positioned(
-            left: 20,
-            right: 20,
-            top: 20,
-            child: TextField(
-              controller: _amountController,
-              focusNode: _amountFocus,
-              keyboardType: const TextInputType.numberWithOptions(decimal: true),
-              scrollPadding: EdgeInsets.zero,
-              inputFormatters: [DecimalInputFilter()],
-              style: text.mediumTitle?.copyWith(color: colors.textPrimary, fontSize: 32),
-              decoration: InputDecoration(
-                isDense: true,
-                filled: false,
-                contentPadding: EdgeInsets.zero,
-                border: InputBorder.none,
-                enabledBorder: InputBorder.none,
-                focusedBorder: InputBorder.none,
-                hintText: '0 ${AppConstants.tokenSymbol}',
-                hintStyle: text.mediumTitle?.copyWith(color: colors.textTertiary, fontSize: 32),
-              ),
-            ),
-          ),
-          Positioned(
-            left: 20,
-            right: 20,
-            bottom: 20,
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Text(
-                  'Available: ${balance.when(data: (b) => _fmt.formatBalance(b), loading: () => '...', error: (_, _) => '0')} ${AppConstants.tokenSymbol}',
-                  style: text.detail?.copyWith(color: colors.textSecondary),
-                ),
-                GestureDetector(
-                  onTap: _hasAddressError ? null : _setMax,
-                  child: Text('Max', style: text.detail?.copyWith(color: colors.textSecondary)),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _feeRow(AppColorsV2 colors, AppTextTheme text) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children: [
-        Text('Network Fee:', style: text.detail?.copyWith(color: colors.textSecondary)),
-        if (_isFetchingFee)
-          SizedBox(
-            width: 12,
-            height: 12,
-            child: CircularProgressIndicator(strokeWidth: 1.5, color: colors.textSecondary),
-          )
-        else
-          Text(
-            '${_fmt.formatBalance(_networkFee, maxDecimals: 4)} ${AppConstants.tokenSymbol}',
-            style: text.detail?.copyWith(color: colors.textSecondary),
-          ),
-      ],
-    );
-  }
-
-  Widget _buildConfirm(AppColorsV2 colors, AppTextTheme text) {
-    final recipient = _recipientController.text.trim();
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        const SizedBox(height: 40),
-        Text(
-          '${_fmt.formatBalance(_amount)} ${AppConstants.tokenSymbol}',
-          style: text.mediumTitle?.copyWith(color: colors.textPrimary, fontSize: 32),
-        ),
-        const SizedBox(height: 64),
-        Text(
-          'To:',
-          style: text.paragraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w600),
-        ),
-        const SizedBox(height: 12),
-        Text(
-          AddressFormattingService.formatAddress(recipient, prefix: 15, ellipses: '.......', postFix: 14),
-          style: text.smallParagraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w500),
-        ),
-        if (_recipientChecksum != null) ...[
-          const SizedBox(height: 4),
-          Text(_recipientChecksum!, style: text.smallParagraph?.copyWith(color: colors.accentPink)),
-        ],
-        if (_errorMessage != null) ...[
-          const SizedBox(height: 16),
-          Text(_errorMessage!, style: text.detail?.copyWith(color: colors.textError)),
-        ],
-        const SizedBox(height: 64),
-        _feeRow(colors, text),
-        const SizedBox(height: 8),
-        _actionButton(label: 'Confirm', colors: colors, text: text, onTap: _confirmSend),
-      ],
-    );
-  }
-
-  Widget _buildSending(AppColorsV2 colors, AppTextTheme text) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        const SizedBox(height: 48),
-        CircularProgressIndicator(color: colors.textPrimary),
-        const SizedBox(height: 24),
-        Text(
-          widget.isPayMode ? 'Paying...' : 'Sending...',
-          style: text.smallTitle?.copyWith(color: colors.textPrimary),
-        ),
-        const SizedBox(height: 80),
-      ],
-    );
-  }
-
-  Widget _buildComplete(AppColorsV2 colors, AppTextTheme text) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        const SizedBox(height: 48),
-        const SuccessCheck(size: 64),
-        const SizedBox(height: 24),
-        Text(widget.isPayMode ? 'Paid!' : 'Sent!', style: text.smallTitle?.copyWith(color: colors.textPrimary)),
-        const SizedBox(height: 8),
-        Text(
-          '${_fmt.formatBalance(_amount)} ${AppConstants.tokenSymbol}',
-          style: text.paragraph?.copyWith(color: colors.textSecondary),
-        ),
-        const SizedBox(height: 80),
-        _actionButton(label: 'Done', colors: colors, text: text, onTap: () => Navigator.pop(context)),
-      ],
-    );
-  }
-
-  Widget _iconButton(IconData icon, AppColorsV2 colors, VoidCallback onTap) {
-    return GlassIconButton.rounded(icon: icon, onTap: onTap);
-  }
-
-  Widget _actionButton({
-    required String label,
-    required AppColorsV2 colors,
-    required AppTextTheme text,
-    bool disabled = false,
-    VoidCallback? onTap,
-  }) {
-    return GlassButton.simple(label: label, onTap: onTap, isDisabled: disabled, variant: ButtonVariant.secondary);
-  }
-}
-
-void showSendSheetV2(BuildContext context, {String? address, String? amount, bool isPayMode = false}) {
-  BottomSheetContainer.show(
-    context,
-    builder: (_) => SendSheet(initialAddress: address, initialAmount: amount, isPayMode: isPayMode),
-  );
-}
diff --git a/mobile-app/lib/v2/screens/send/tx_submitted_screen.dart b/mobile-app/lib/v2/screens/send/tx_submitted_screen.dart
new file mode 100644
index 000000000..298b32f16
--- /dev/null
+++ b/mobile-app/lib/v2/screens/send/tx_submitted_screen.dart
@@ -0,0 +1,140 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
+import 'package:resonance_network_wallet/v2/components/back_button.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/home/home_screen.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class TxSubmittedScreen extends ConsumerWidget {
+  final BigInt amount;
+  final String recipientAddress;
+  final String? recipientChecksum;
+  final bool isPayMode;
+
+  const TxSubmittedScreen({
+    super.key,
+    required this.amount,
+    required this.recipientAddress,
+    this.recipientChecksum,
+    this.isPayMode = false,
+  });
+
+  void _popToHome(BuildContext context) {
+    Navigator.pushAndRemoveUntil(context, MaterialPageRoute(builder: (_) => const HomeScreen()), (route) => false);
+  }
+
+  String _headline(WidgetRef ref) {
+    final formattingService = ref.watch(numberFormattingServiceProvider);
+    final n = formattingService.formatBalance(amount, maxDecimals: 4);
+    final action = isPayMode ? 'paid' : 'sent';
+    return '$n ${AppConstants.tokenSymbol} $action';
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final colors = context.colors;
+    final text = context.themeText;
+    final addr = recipientAddress.trim();
+    final shortAddr = AddressFormattingService.formatAddress(addr);
+
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (bool didPop, Object? result) {
+        if (didPop) return;
+        _popToHome(context);
+      },
+      child: ScaffoldBase(
+        appBar: V2AppBar(
+          title: isPayMode ? 'Pay' : 'Send',
+          leading: AppBackButton(onTap: () => _popToHome(context)),
+        ),
+        mainContent: Column(
+          children: [
+            Center(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  const SizedBox(height: 70),
+                  _successMark(colors),
+                  const SizedBox(height: 32),
+                  Text(
+                    _headline(ref),
+                    textAlign: TextAlign.center,
+                    style: text.largeTitle?.copyWith(fontWeight: FontWeight.w400),
+                  ),
+                  const SizedBox(height: 4),
+                  Text(
+                    'On its way',
+                    textAlign: TextAlign.center,
+                    style: text.smallParagraph?.copyWith(color: colors.textTertiary, letterSpacing: 0.74),
+                  ),
+                  const SizedBox(height: 32),
+                  Text.rich(
+                    textAlign: TextAlign.center,
+                    TextSpan(
+                      style: text.paragraph?.copyWith(color: colors.textPrimary),
+                      children: [
+                        TextSpan(
+                          text: 'To',
+                          style: text.paragraph?.copyWith(fontWeight: FontWeight.w500),
+                        ),
+                        TextSpan(
+                          text: ':',
+                          style: text.paragraph?.copyWith(fontWeight: FontWeight.w600),
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+                  if (recipientChecksum != null && recipientChecksum!.isNotEmpty) ...[
+                    Text(
+                      recipientChecksum!,
+                      textAlign: TextAlign.center,
+                      style: text.smallParagraph?.copyWith(color: colors.checksum, height: 1.0),
+                    ),
+                    const SizedBox(height: 4),
+                  ],
+                  Text(
+                    shortAddr,
+                    textAlign: TextAlign.center,
+                    style: text.smallParagraph?.copyWith(
+                      color: colors.textPrimary,
+                      fontWeight: FontWeight.w500,
+                      fontFamily: AppTextTheme.fontFamilySecondary,
+                      height: 1.35,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+        bottomContent: ScaffoldBaseBottomContent(
+          child: QuantusButton.simple(label: 'Done', variant: ButtonVariant.primary, onTap: () => _popToHome(context)),
+        ),
+      ),
+    );
+  }
+
+  Widget _successMark(AppColorsV2 colors) {
+    final containerSize = 78.0;
+    final iconSize = 32.0;
+
+    return Container(
+      width: containerSize,
+      height: containerSize,
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        border: Border.all(color: colors.success, width: 2),
+      ),
+      alignment: Alignment.center,
+      child: Icon(Icons.check, size: iconSize, color: colors.success),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/about_quantus_screen.dart b/mobile-app/lib/v2/screens/settings/about_quantus_screen.dart
new file mode 100644
index 000000000..c0534e644
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/about_quantus_screen.dart
@@ -0,0 +1,77 @@
+import 'package:flutter/material.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/generated/version.g.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_divider.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_tappable_row.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class AboutQuantusScreenV2 extends StatelessWidget {
+  const AboutQuantusScreenV2({super.key});
+
+  static const _kIntro =
+      'Quantus is a Layer 1 blockchain secured by ML-DSA Dilithium-5, the gold standard in quantum-resistant encryption. '
+      'Built for a future where classical cryptography is no longer enough. Post-quantum cryptography for everyone.';
+
+  /// [path] is a path under [AppConstants.websiteBaseUrl] (e.g. `/terms`), or empty for the site root.
+  static const _externalLinks = <({String title, String subtitle, String path})>[
+    (title: 'Terms of Service', subtitle: 'quantus.com/terms/', path: '/terms'),
+    (title: 'Privacy policy', subtitle: 'quantus.com/privacy-policy/', path: '/privacy-policy'),
+    (title: 'Visit Website', subtitle: 'quantus.com', path: ''),
+  ];
+
+  static Uri _uriForAboutLink(({String title, String subtitle, String path}) link) {
+    if (link.path.isEmpty) {
+      return Uri.parse(AppConstants.websiteBaseUrl);
+    }
+    return Uri.parse('${AppConstants.websiteBaseUrl}${link.path}');
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'About'),
+      mainContent: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          Expanded(
+            child: ListView(
+              children: [
+                Text(_kIntro, style: text.smallParagraph?.copyWith(color: colors.textMuted, height: 1.35)),
+                const SizedBox(height: 40),
+                for (final entry in _externalLinks.asMap().entries) ...[
+                  SettingsTappableRow(
+                    title: entry.value.title,
+                    subtitle: entry.value.subtitle,
+                    onTap: () => launchUrl(_uriForAboutLink(entry.value)),
+                    trailing: SettingsTappableRowUtils.externalLink(colors),
+                  ),
+                  if (entry.key < _externalLinks.length - 1) const SettingsDivider(),
+                ],
+              ],
+            ),
+          ),
+          Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Image.asset('assets/v2/quantus_orange_logo.png', height: 40),
+              const SizedBox(height: 14),
+              Text(
+                'Version $appVersion ($appBuildNumber)',
+                textAlign: TextAlign.center,
+                style: text.paragraph?.copyWith(color: colors.textMuted, fontSize: 16, height: 1.0),
+              ),
+            ],
+          ),
+          const SizedBox(height: 64),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/account_type_settings_screen.dart b/mobile-app/lib/v2/screens/settings/account_type_settings_screen.dart
new file mode 100644
index 000000000..fadbdcf02
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/account_type_settings_screen.dart
@@ -0,0 +1,112 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_divider.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class AccountTypeSettingsScreenV2 extends StatelessWidget {
+  const AccountTypeSettingsScreenV2({super.key});
+
+  static const _intro =
+      'Advanced account features are coming soon. These will give you greater control over how transactions are authorised and secured.';
+
+  static const _upcomingFeatures = <({String title, String subtitle})>[
+    (title: 'Reversible Transactions', subtitle: 'Reverse your sends within a time window'),
+    (title: 'High Security Account', subtitle: 'Guardian approval required'),
+    (title: 'Multi-Signature', subtitle: 'Multiple approvals required'),
+    (title: 'Hardware Wallet', subtitle: 'Pair a hardware device'),
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Account Type'),
+      mainContent: ListView(
+        children: [
+          Text(_intro, style: text.smallParagraph?.copyWith(color: colors.textMuted)),
+          const SizedBox(height: 40),
+          for (var i = 0; i < _upcomingFeatures.length; i++)
+            _AccountFeatureBlock(
+              colors: colors,
+              text: text,
+              title: _upcomingFeatures[i].title,
+              subtitle: _upcomingFeatures[i].subtitle,
+              showDividerBelow: i < _upcomingFeatures.length - 1,
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+class _AccountFeatureBlock extends StatelessWidget {
+  const _AccountFeatureBlock({
+    required this.colors,
+    required this.text,
+    required this.title,
+    required this.subtitle,
+    required this.showDividerBelow,
+  });
+
+  final AppColorsV2 colors;
+  final AppTextTheme text;
+  final String title;
+  final String subtitle;
+  final bool showDividerBelow;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        Opacity(
+          opacity: 0.5,
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Expanded(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(title, style: text.smallTitle?.copyWith(fontWeight: FontWeight.w400)),
+                    const SizedBox(height: 2),
+                    Text(subtitle, style: text.smallParagraph?.copyWith(color: colors.textTertiary)),
+                  ],
+                ),
+              ),
+              const SizedBox(width: 24),
+              _ComingSoonBadge(colors: colors, text: text),
+            ],
+          ),
+        ),
+        if (showDividerBelow) const SettingsDivider(),
+      ],
+    );
+  }
+}
+
+class _ComingSoonBadge extends StatelessWidget {
+  const _ComingSoonBadge({required this.colors, required this.text});
+
+  final AppColorsV2 colors;
+  final AppTextTheme text;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.all(6),
+      decoration: BoxDecoration(
+        color: colors.sheetBackground,
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(color: colors.borderButton),
+      ),
+      alignment: Alignment.center,
+      child: Text('Coming Soon', style: text.detail?.copyWith(color: colors.textMuted)),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/currency_picker_screen.dart b/mobile-app/lib/v2/screens/settings/currency_picker_screen.dart
new file mode 100644
index 000000000..18fdf261b
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/currency_picker_screen.dart
@@ -0,0 +1,177 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:resonance_network_wallet/models/fiat_currency.dart';
+import 'package:resonance_network_wallet/providers/currency_display_provider.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_divider.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class CurrencyPickerScreenV2 extends ConsumerStatefulWidget {
+  const CurrencyPickerScreenV2({super.key});
+
+  @override
+  ConsumerState<CurrencyPickerScreenV2> createState() => _CurrencyPickerScreenV2State();
+}
+
+class _CurrencyPickerScreenV2State extends ConsumerState<CurrencyPickerScreenV2> {
+  final _searchController = TextEditingController();
+
+  @override
+  void dispose() {
+    _searchController.dispose();
+    super.dispose();
+  }
+
+  List<FiatCurrency> _filtered(String query) {
+    final q = query.trim().toLowerCase();
+    final list = List<FiatCurrency>.from(FiatCurrency.values);
+    if (q.isEmpty) return list;
+    return list.where((c) {
+      final line = c.line.toLowerCase();
+      return line.contains(q) || c.code.toLowerCase().contains(q);
+    }).toList();
+  }
+
+  Future<void> _onSelect(FiatCurrency c) async {
+    await ref.read(selectedFiatCurrencyProvider.notifier).select(c);
+    if (mounted) Navigator.pop(context);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+    final selected = ref.watch(selectedFiatCurrencyProvider);
+    final filtered = _filtered(_searchController.text);
+
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Currency'),
+      mainContent: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          _SearchField(controller: _searchController, colors: colors, text: text, onChanged: (_) => setState(() {})),
+          const SizedBox(height: 24),
+          Expanded(
+            child: Container(
+              decoration: BoxDecoration(color: colors.surfaceDeep, borderRadius: BorderRadius.circular(14)),
+              clipBehavior: Clip.antiAlias,
+              child: Scrollbar(
+                thumbVisibility: true,
+                thickness: 4,
+                radius: const Radius.circular(25),
+                child: filtered.isEmpty
+                    ? Center(
+                        child: Text(
+                          'No currencies match your search',
+                          style: text.smallParagraph?.copyWith(color: colors.textMuted),
+                          textAlign: TextAlign.center,
+                        ),
+                      )
+                    : ListView.separated(
+                        itemCount: filtered.length,
+                        separatorBuilder: (context, index) =>
+                            const SettingsDivider(style: SettingsDividerStyle.currencyList, padding: EdgeInsets.zero),
+                        itemBuilder: (context, index) {
+                          final c = filtered[index];
+                          final isSelected = c == selected;
+
+                          return _CurrencyListTile(
+                            label: c.line,
+                            selected: isSelected,
+                            colors: colors,
+                            text: text,
+                            onTap: () => _onSelect(c),
+                          );
+                        },
+                      ),
+              ),
+            ),
+          ),
+          const SizedBox(height: 40),
+        ],
+      ),
+    );
+  }
+}
+
+class _SearchField extends StatelessWidget {
+  const _SearchField({required this.controller, required this.colors, required this.text, required this.onChanged});
+
+  final TextEditingController controller;
+  final AppColorsV2 colors;
+  final AppTextTheme text;
+  final ValueChanged<String> onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 48,
+      child: Container(
+        padding: const EdgeInsets.only(left: 12, right: 8),
+        decoration: BoxDecoration(color: colors.surfaceDeep, borderRadius: BorderRadius.circular(14)),
+        child: Row(
+          children: [
+            Icon(Icons.search, size: 18, color: colors.textLabel),
+            const SizedBox(width: 8),
+            Expanded(
+              child: TextField(
+                controller: controller,
+                onChanged: onChanged,
+                style: text.smallParagraph,
+                decoration: InputDecoration(
+                  isDense: true,
+                  border: InputBorder.none,
+                  hintText: 'Search',
+                  hintStyle: text.smallParagraph?.copyWith(color: colors.textLabel),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _CurrencyListTile extends StatelessWidget {
+  const _CurrencyListTile({
+    required this.label,
+    required this.selected,
+    required this.colors,
+    required this.text,
+    required this.onTap,
+  });
+
+  final String label;
+  final bool selected;
+  final AppColorsV2 colors;
+  final AppTextTheme text;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final accent = colors.accentOrange;
+    final fg = selected ? accent : colors.textPrimary;
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: onTap,
+        child: Padding(
+          padding: const EdgeInsets.all(24),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Expanded(
+                child: Text(label, style: text.paragraph?.copyWith(color: fg, height: 1.2)),
+              ),
+              if (selected) ...[const SizedBox(width: 12), Icon(Icons.check, size: 18, color: accent)],
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/help_and_support_screen.dart b/mobile-app/lib/v2/screens/settings/help_and_support_screen.dart
new file mode 100644
index 000000000..3c75102c2
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/help_and_support_screen.dart
@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_divider.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_tappable_row.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class HelpAndSupportScreenV2 extends StatelessWidget {
+  const HelpAndSupportScreenV2({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Help & Support'),
+      mainContent: ListView(
+        children: [
+          _contactBlock(
+            title: 'Email Support',
+            subtitle: AppConstants.emailSupport,
+            colors: colors,
+            onTap: () => launchUrl(Uri.parse('mailto:${AppConstants.emailSupport}')),
+          ),
+          _contactBlock(
+            title: 'Telegram',
+            subtitle: AppConstants.telegramHandle,
+            colors: colors,
+            onTap: () => launchUrl(Uri.parse(AppConstants.communityUrl)),
+            showBottomDivider: false,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _contactBlock({
+    required String title,
+    required String subtitle,
+    required AppColorsV2 colors,
+    required VoidCallback onTap,
+    bool showBottomDivider = true,
+  }) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        SettingsTappableRow(
+          title: title,
+          subtitle: subtitle,
+          onTap: onTap,
+          trailing: SettingsTappableRowUtils.externalLink(colors),
+        ),
+        if (showBottomDivider) const SettingsDivider(),
+      ],
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/preferences_settings_screen.dart b/mobile-app/lib/v2/screens/settings/preferences_settings_screen.dart
new file mode 100644
index 000000000..7d4eb1cb1
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/preferences_settings_screen.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:resonance_network_wallet/providers/currency_display_provider.dart';
+import 'package:resonance_network_wallet/providers/notification_config_provider.dart';
+import 'package:resonance_network_wallet/providers/wallet_providers.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/currency_picker_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_divider.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_tappable_row.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class PreferencesSettingsScreenV2 extends ConsumerStatefulWidget {
+  const PreferencesSettingsScreenV2({super.key});
+
+  @override
+  ConsumerState<PreferencesSettingsScreenV2> createState() => _PreferencesSettingsScreenV2State();
+}
+
+class _PreferencesSettingsScreenV2State extends ConsumerState<PreferencesSettingsScreenV2> {
+  void _toggleNotifications(bool enable) {
+    final current = ref.read(notificationConfigProvider);
+    ref.read(notificationConfigProvider.notifier).updateConfig(current.copyWith(enabled: enable));
+  }
+
+  void _openCurrencyPicker() {
+    Navigator.push(context, MaterialPageRoute(builder: (_) => const CurrencyPickerScreenV2()));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+    final notifConfig = ref.watch(notificationConfigProvider);
+    final posMode = ref.watch(posModeProvider);
+    final fiat = ref.watch(selectedFiatCurrencyProvider);
+
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Preferences'),
+      mainContent: ListView(
+        children: [
+          SettingsTappableRow(
+            title: 'Currency',
+            subtitle: 'Fiat display preference',
+            onTap: _openCurrencyPicker,
+            trailing: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(fiat.code, style: text.smallParagraph?.copyWith(color: colors.textMuted)),
+                const SizedBox(width: 4),
+                SettingsTappableRowUtils.chevron(colors, color: colors.textMuted, size: 18),
+              ],
+            ),
+          ),
+          const SettingsDivider(),
+          SettingsSwitchRow(
+            title: 'POS Mode',
+            subtitle: 'Point of sale features',
+            value: posMode,
+            onChanged: (v) => ref.read(posModeProvider.notifier).setPosMode(v),
+          ),
+          const SettingsDivider(),
+          SettingsSwitchRow(
+            title: 'Notifications',
+            subtitle: 'Transaction and wallet alerts',
+            value: notifConfig.enabled,
+            onChanged: _toggleNotifications,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/recovery_phrase_confirmation_screen.dart b/mobile-app/lib/v2/screens/settings/recovery_phrase_confirmation_screen.dart
new file mode 100644
index 000000000..4d86afff8
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/recovery_phrase_confirmation_screen.dart
@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/services/local_auth_service.dart';
+import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/recovery_phrase_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_caution_scaffold.dart';
+
+class RecoveryPhraseConfirmationScreen extends StatefulWidget {
+  const RecoveryPhraseConfirmationScreen({super.key, required this.walletIndex});
+
+  final int walletIndex;
+
+  @override
+  State<RecoveryPhraseConfirmationScreen> createState() => _RecoveryPhraseConfirmationScreenState();
+}
+
+class _RecoveryPhraseConfirmationScreenState extends State<RecoveryPhraseConfirmationScreen> {
+  bool _acknowledged = false;
+
+  Future<void> _onContinue() async {
+    final authed = await LocalAuthService().authenticate(localizedReason: 'Authenticate to see recovery phrase');
+
+    if (authed && mounted) {
+      Navigator.of(
+        context,
+      ).pushReplacement(MaterialPageRoute(builder: (_) => RecoveryPhraseScreen(walletIndex: widget.walletIndex)));
+    } else {
+      if (mounted) {
+        context.showErrorToaster(message: 'Authentication required to see recovery phrase');
+      }
+
+      return;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final data = const SettingsCautionScaffoldData.recoveryPhrase();
+
+    return SettingsCautionScaffold(
+      appBarTitle: 'Recovery Phrase',
+      data: data,
+      checkboxChecked: _acknowledged,
+      onCheckboxChanged: () => setState(() => _acknowledged = !_acknowledged),
+      onContinue: _onContinue,
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/recovery_phrase_screen.dart b/mobile-app/lib/v2/screens/settings/recovery_phrase_screen.dart
index 693e8e1cd..c7c375460 100644
--- a/mobile-app/lib/v2/screens/settings/recovery_phrase_screen.dart
+++ b/mobile-app/lib/v2/screens/settings/recovery_phrase_screen.dart
@@ -1,13 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/features/components/mnemonic_grid.dart';
-import 'package:resonance_network_wallet/services/local_auth_service.dart';
-import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
-import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+import 'package:resonance_network_wallet/v2/components/recovery_phrase_body.dart';
 
 class RecoveryPhraseScreen extends StatefulWidget {
   const RecoveryPhraseScreen({super.key, this.walletIndex = 0});
@@ -20,25 +13,7 @@ class RecoveryPhraseScreen extends StatefulWidget {
 
 class _RecoveryPhraseScreenState extends State<RecoveryPhraseScreen> {
   final _settingsService = SettingsService();
-  final _authService = LocalAuthService();
   List<String> _words = [];
-  bool _revealed = false;
-
-  Future<void> _toggleReveal() async {
-    if (_revealed) {
-      setState(() {
-        _revealed = false;
-      });
-      return;
-    }
-
-    final ok = await _authService.authenticate(localizedReason: 'Authenticate to reveal recovery phrase');
-    if (!ok || !mounted) return;
-
-    setState(() {
-      _revealed = true;
-    });
-  }
 
   void _loadMnemonic() async {
     final mnemonic = await _settingsService.getMnemonic(widget.walletIndex);
@@ -49,10 +24,6 @@ class _RecoveryPhraseScreenState extends State<RecoveryPhraseScreen> {
     }
   }
 
-  void _copyToClipboard() {
-    context.copyTextWithToaster(_words.join(' '), message: 'Recovery phrase copied to clipboard');
-  }
-
   @override
   void initState() {
     super.initState();
@@ -61,79 +32,11 @@ class _RecoveryPhraseScreenState extends State<RecoveryPhraseScreen> {
 
   @override
   Widget build(BuildContext context) {
-    final colors = context.colors;
-    final text = context.themeText;
-
-    return ScaffoldBase(
-      appBar: const V2AppBar(title: 'Recovery Phrase'),
-      child: Column(
-        children: [
-          _warning(colors, text),
-          const SizedBox(height: 40),
-          Expanded(
-            child: SingleChildScrollView(
-              child: MnemonicGrid(words: _words, isRevealed: _revealed),
-            ),
-          ),
-          const SizedBox(height: 16),
-          IgnorePointer(
-            ignoring: !_revealed,
-            child: AnimatedOpacity(
-              duration: const Duration(milliseconds: 200),
-              opacity: _revealed ? 1.0 : 0.0,
-              child: _copyRow(colors, text),
-            ),
-          ),
-          const SizedBox(height: 16),
-          _revealButton(colors, text),
-          const SizedBox(height: 24),
-        ],
-      ),
-    );
-  }
-
-  Widget _warning(AppColorsV2 colors, AppTextTheme text) {
-    return Column(
-      children: [
-        Row(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Icon(Icons.warning_amber_rounded, color: colors.accentPink, size: 24),
-            const SizedBox(width: 8),
-            Text('Important Warning', style: text.smallTitle?.copyWith(color: colors.accentPink)),
-          ],
-        ),
-        const SizedBox(height: 8),
-        Text(
-          'Your recovery phrase is the only way to restore your wallet. Never share it with anyone.',
-          style: text.paragraph,
-          textAlign: TextAlign.center,
-        ),
-      ],
-    );
-  }
-
-  Widget _copyRow(AppColorsV2 colors, AppTextTheme text) {
-    return GlassButton.simple(
-      padding: const EdgeInsets.all(0),
-      label: 'Copy to clipboard',
-      onTap: _copyToClipboard,
-      variant: ButtonVariant.transparent,
-      textStyle: text.smallParagraph?.copyWith(color: colors.textPrimary),
-      icon: Icon(Icons.copy, color: colors.textPrimary, size: 14),
-    );
-  }
-
-  Widget _revealButton(AppColorsV2 colors, AppTextTheme text) {
-    final label = _revealed ? 'Hide Recovery Phrase' : 'Reveal Recovery Phrase';
-    final icon = _revealed ? Icons.visibility_off_outlined : Icons.visibility_outlined;
-
-    return GlassButton.simple(
-      label: label,
-      onTap: _toggleReveal,
-      variant: ButtonVariant.secondary,
-      icon: Icon(icon, color: colors.textPrimary, size: 16),
-      iconPlacement: IconPlacement.leading,
+    return RecoveryPhraseBody(
+      appBarTitle: 'Recovery Phrase',
+      words: _words,
+      primaryButtonLabel: 'Done',
+      onPrimary: () => Navigator.of(context).pop(),
     );
   }
 }
diff --git a/mobile-app/lib/v2/screens/settings/reset_confirmation_screen.dart b/mobile-app/lib/v2/screens/settings/reset_confirmation_screen.dart
new file mode 100644
index 000000000..aa6832b8d
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/reset_confirmation_screen.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:resonance_network_wallet/services/local_auth_service.dart';
+import 'package:resonance_network_wallet/services/logout_service.dart';
+import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_caution_scaffold.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_divider.dart';
+
+class ResetConfirmationScreen extends ConsumerStatefulWidget {
+  const ResetConfirmationScreen({super.key});
+
+  @override
+  ConsumerState<ResetConfirmationScreen> createState() => _ResetConfirmationScreenState();
+}
+
+class _ResetConfirmationScreenState extends ConsumerState<ResetConfirmationScreen> {
+  bool _backedUpChecked = false;
+  bool _isResetting = false;
+
+  Future<void> _resetAndClearData() async {
+    setState(() => _isResetting = true);
+
+    final authed = await LocalAuthService().authenticate(localizedReason: 'Authenticate to reset wallet');
+
+    if (authed && mounted) {
+      try {
+        await ref.read(logoutServiceProvider).logout(context);
+      } catch (e) {
+        if (mounted) {
+          context.showErrorToaster(message: 'Failed to reset wallet: $e');
+        }
+        setState(() => _isResetting = false);
+      }
+    } else if (mounted) {
+      context.showErrorToaster(message: 'Authentication required to reset wallet');
+
+      setState(() => _isResetting = false);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SettingsCautionScaffold(
+      appBarTitle: 'Reset Wallet',
+      data: const SettingsCautionScaffoldData.walletReset(),
+      betweenBulletsStyle: SettingsDividerStyle.sectionEmphasis,
+      checkboxChecked: _backedUpChecked,
+      onCheckboxChanged: () => setState(() => _backedUpChecked = !_backedUpChecked),
+      onContinue: _resetAndClearData,
+      continueButtonLoading: _isResetting,
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/reset_confirmation_sheet.dart b/mobile-app/lib/v2/screens/settings/reset_confirmation_sheet.dart
deleted file mode 100644
index 177842abd..000000000
--- a/mobile-app/lib/v2/screens/settings/reset_confirmation_sheet.dart
+++ /dev/null
@@ -1,74 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:quantus_sdk/quantus_sdk.dart';
-import 'package:resonance_network_wallet/v2/components/bottom_sheet_container.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
-
-class ResetConfirmationSheet extends StatefulWidget {
-  final VoidCallback onReset;
-  const ResetConfirmationSheet({super.key, required this.onReset});
-
-  @override
-  State<ResetConfirmationSheet> createState() => _ResetConfirmationSheetState();
-}
-
-class _ResetConfirmationSheetState extends State<ResetConfirmationSheet> {
-  bool _isCheckboxChecked = false;
-  bool _isResetting = false;
-
-  @override
-  Widget build(BuildContext context) {
-    return BottomSheetContainer(
-      title: 'Confirm Reset',
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          const SizedBox(height: 32),
-          Text(
-            'Are you sure you want to proceed? This will delete all local wallet data. Make sure you have backed up your recovery phrase.',
-            style: context.themeText.smallParagraph,
-          ),
-          const SizedBox(height: 64),
-          CheckboxListTile(
-            contentPadding: const EdgeInsets.all(0),
-            controlAffinity: ListTileControlAffinity.leading,
-            value: _isCheckboxChecked,
-            onChanged: (bool? value) {
-              setState(() {
-                _isCheckboxChecked = value ?? false;
-              });
-            },
-            activeColor: context.colors.success,
-            checkColor: context.colors.success,
-            side: const BorderSide(color: Colors.white),
-            title: Text('I have backed up my recovery phrase', style: context.themeText.smallParagraph),
-          ),
-          const SizedBox(height: 64),
-          GlassButton.simple(
-            label: 'Confirm',
-            onTap: () {
-              setState(() => _isResetting = true);
-              widget.onReset();
-            },
-            isDisabled: !_isCheckboxChecked,
-            variant: ButtonVariant.secondary,
-            isLoading: _isResetting,
-          ),
-          const SizedBox(height: 16),
-          GlassButton.simple(
-            padding: const EdgeInsets.all(0),
-            label: 'Cancel',
-            onTap: () => Navigator.pop(context),
-            variant: ButtonVariant.transparent,
-            textStyle: context.themeText.paragraph?.copyWith(color: context.colors.textPrimary.useOpacity(0.5)),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-void showResetConfirmationSheetV2(BuildContext context, VoidCallback onReset) {
-  BottomSheetContainer.show(context, builder: (_) => ResetConfirmationSheet(onReset: onReset));
-}
diff --git a/mobile-app/lib/v2/screens/settings/select_wallet_screen.dart b/mobile-app/lib/v2/screens/settings/select_wallet_screen.dart
index bff20bae8..f4a3eafbd 100644
--- a/mobile-app/lib/v2/screens/settings/select_wallet_screen.dart
+++ b/mobile-app/lib/v2/screens/settings/select_wallet_screen.dart
@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:resonance_network_wallet/providers/account_providers.dart';
 import 'package:resonance_network_wallet/shared/utils/account_utils.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
-import 'package:resonance_network_wallet/v2/screens/settings/recovery_phrase_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/recovery_phrase_confirmation_screen.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
 
@@ -19,8 +20,8 @@ class SelectWalletScreen extends ConsumerWidget {
 
     return ScaffoldBase(
       appBar: const V2AppBar(title: 'Select Wallet'),
-      child: accountsAsync.when(
-        loading: () => const Center(child: CircularProgressIndicator(color: Colors.white24)),
+      mainContent: accountsAsync.when(
+        loading: () => const Center(child: Loader()),
         error: (e, _) => Center(
           child: Text('Failed to load wallets', style: text.paragraph?.copyWith(color: colors.textSecondary)),
         ),
@@ -43,8 +44,10 @@ class SelectWalletScreen extends ConsumerWidget {
 
   Widget _walletItem(BuildContext context, int walletIndex, AppColorsV2 colors, AppTextTheme text) {
     return GestureDetector(
-      onTap: () =>
-          Navigator.push(context, MaterialPageRoute(builder: (_) => RecoveryPhraseScreen(walletIndex: walletIndex))),
+      onTap: () => Navigator.push(
+        context,
+        MaterialPageRoute(builder: (_) => RecoveryPhraseConfirmationScreen(walletIndex: walletIndex)),
+      ),
       child: Container(
         padding: const EdgeInsets.all(20),
         decoration: BoxDecoration(color: colors.surfaceCard, borderRadius: BorderRadius.circular(14)),
diff --git a/mobile-app/lib/v2/screens/settings/settings_caution_scaffold.dart b/mobile-app/lib/v2/screens/settings/settings_caution_scaffold.dart
new file mode 100644
index 000000000..840fd05e9
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/settings_caution_scaffold.dart
@@ -0,0 +1,131 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base_bottom_content.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_checkbox.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_divider.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_list_row.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class SettingsCautionScaffoldData {
+  final String headline;
+  final List<String> bulletItems;
+  final String checkboxLabel;
+
+  const SettingsCautionScaffoldData({required this.headline, required this.bulletItems, required this.checkboxLabel});
+
+  const SettingsCautionScaffoldData.recoveryPhrase()
+    : this(
+        headline: 'Keep your Recovery Phrase Secret',
+        bulletItems: const [
+          'If you lose this device, your recovery phrase is the only way back',
+          'Anyone who gets hold of it has complete control over your funds, permanently',
+          'Write it down and keep it somewhere safe. Do not save it digitally',
+        ],
+        checkboxLabel: 'I understand that anyone with my recovery phrase can access my wallet. I will store it safely.',
+      );
+
+  const SettingsCautionScaffoldData.walletReset()
+    : this(
+        headline: 'This will erase\nyour wallet',
+        bulletItems: const [
+          'All wallet data will be permanently removed from this device',
+          'Your funds stay on the blockchain but only your recovery phrase can restore access',
+          'Without it, your funds are gone forever',
+        ],
+        checkboxLabel: "I've backed up my recovery phrase",
+      );
+}
+
+class SettingsCautionScaffold extends StatelessWidget {
+  final String appBarTitle;
+  final bool checkboxChecked;
+  final VoidCallback onCheckboxChanged;
+  final VoidCallback onContinue;
+  final SettingsCautionScaffoldData data;
+  final SettingsDividerStyle betweenBulletsStyle;
+  final bool continueButtonLoading;
+
+  const SettingsCautionScaffold({
+    super.key,
+    required this.appBarTitle,
+    required this.checkboxChecked,
+    required this.onCheckboxChanged,
+    required this.onContinue,
+    required this.data,
+    this.betweenBulletsStyle = SettingsDividerStyle.list,
+    this.continueButtonLoading = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+
+    final headlineStyle = text.mediumTitle?.copyWith(fontSize: 28);
+
+    return ScaffoldBase(
+      appBar: V2AppBar(title: appBarTitle),
+      mainContent: SingleChildScrollView(
+        child: Column(
+          children: [
+            Icon(Icons.warning_amber_outlined, size: 40, color: colors.accentOrange),
+            const SizedBox(height: 16),
+            Text(data.headline, textAlign: TextAlign.center, style: headlineStyle),
+            const SizedBox(height: 40),
+            for (var i = 0; i < data.bulletItems.length; i++) ...[
+              SettingsListRow(label: (i + 1).toString().padLeft(2, '0'), content: data.bulletItems[i]),
+              if (i < data.bulletItems.length - 1) SettingsDivider(style: betweenBulletsStyle),
+            ],
+            const SizedBox(height: 40),
+          ],
+        ),
+      ),
+      bottomContent: _SettingsCautionBottom(
+        checkboxLabel: data.checkboxLabel,
+        checked: checkboxChecked,
+        onCheckboxChanged: onCheckboxChanged,
+        onContinue: onContinue,
+        continueButtonLoading: continueButtonLoading,
+      ),
+    );
+  }
+}
+
+class _SettingsCautionBottom extends StatelessWidget {
+  const _SettingsCautionBottom({
+    required this.checkboxLabel,
+    required this.checked,
+    required this.onCheckboxChanged,
+    required this.onContinue,
+    required this.continueButtonLoading,
+  });
+
+  final String checkboxLabel;
+  final bool checked;
+  final VoidCallback onCheckboxChanged;
+  final VoidCallback onContinue;
+  final bool continueButtonLoading;
+
+  @override
+  Widget build(BuildContext context) {
+    return ScaffoldBaseBottomContent(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          SettingsCheckbox(checked: checked, label: checkboxLabel, onTap: onCheckboxChanged),
+          const SizedBox(height: 32),
+          QuantusButton.simple(
+            label: 'Continue',
+            onTap: onContinue,
+            variant: ButtonVariant.primary,
+            isDisabled: !checked,
+            isLoading: continueButtonLoading,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/settings_checkbox.dart b/mobile-app/lib/v2/screens/settings/settings_checkbox.dart
new file mode 100644
index 000000000..8ef7d467f
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/settings_checkbox.dart
@@ -0,0 +1,54 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class SettingsCheckbox extends StatelessWidget {
+  final bool checked;
+  final VoidCallback onTap;
+  final String label;
+
+  const SettingsCheckbox({super.key, required this.checked, required this.label, required this.onTap});
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+
+    final borderColor = checked ? colors.accentOrange : colors.borderButton;
+    final labelStyle = text.paragraph?.copyWith(color: colors.textMuted, fontSize: 16);
+    final double kSettingsSquareCheckboxSize = 20;
+    final double kSettingsSquareCheckboxRadius = 4;
+    final double kSettingsSquareCheckboxCheckSize = 14;
+
+    return Semantics(
+      checked: checked,
+      label: label,
+      child: Material(
+        color: Colors.transparent,
+        child: InkWell(
+          onTap: onTap,
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Container(
+                width: kSettingsSquareCheckboxSize,
+                height: kSettingsSquareCheckboxSize,
+                decoration: BoxDecoration(
+                  color: checked ? colors.accentOrange : Colors.transparent,
+                  borderRadius: BorderRadius.circular(kSettingsSquareCheckboxRadius),
+                  border: Border.all(color: borderColor, width: 1),
+                ),
+                alignment: Alignment.center,
+                child: checked
+                    ? Icon(Icons.check, size: kSettingsSquareCheckboxCheckSize, color: colors.background)
+                    : null,
+              ),
+              const SizedBox(width: 16),
+              Expanded(child: Text(label, style: labelStyle)),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/settings_divider.dart b/mobile-app/lib/v2/screens/settings/settings_divider.dart
new file mode 100644
index 000000000..7b7bf07c4
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/settings_divider.dart
@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+
+enum SettingsDividerStyle { list, walletSection, sectionEmphasis, cardInterior, currencyList }
+
+class SettingsDivider extends StatelessWidget {
+  final SettingsDividerStyle style;
+  final EdgeInsets padding;
+
+  const SettingsDivider({
+    super.key,
+    this.style = SettingsDividerStyle.list,
+    this.padding = const EdgeInsets.only(top: 16, bottom: 24),
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+
+    Widget divider;
+
+    switch (style) {
+      case SettingsDividerStyle.list:
+      case SettingsDividerStyle.walletSection:
+        divider = Divider(color: colors.toasterBackground, thickness: 1);
+      case SettingsDividerStyle.sectionEmphasis:
+        divider = Divider(color: colors.surfaceDeep, thickness: 1);
+      case SettingsDividerStyle.cardInterior:
+        divider = Divider(color: colors.separator, thickness: 1);
+      case SettingsDividerStyle.currencyList:
+        divider = Divider(color: colors.background, thickness: 2);
+    }
+
+    return Padding(padding: padding, child: divider);
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/settings_list_row.dart b/mobile-app/lib/v2/screens/settings/settings_list_row.dart
new file mode 100644
index 000000000..a461c53f3
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/settings_list_row.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class SettingsListRow extends StatelessWidget {
+  const SettingsListRow({super.key, required this.label, required this.content});
+
+  final String label;
+  final String content;
+
+  @override
+  Widget build(BuildContext context) {
+    final text = context.themeText;
+    final colors = context.colors;
+
+    final bodyStyle = text.paragraph?.copyWith(color: colors.textMuted);
+    final numStyle = text.paragraph?.copyWith(
+      fontFamily: AppTextTheme.fontFamilySecondary,
+      color: colors.accentOrange,
+      height: 1.35,
+    );
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(label, style: numStyle),
+        const SizedBox(width: 16),
+        Expanded(child: Text(content, style: bodyStyle)),
+      ],
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/settings_screen.dart b/mobile-app/lib/v2/screens/settings/settings_screen.dart
index 8ee529e2d..905f929e2 100644
--- a/mobile-app/lib/v2/screens/settings/settings_screen.dart
+++ b/mobile-app/lib/v2/screens/settings/settings_screen.dart
@@ -1,321 +1,104 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'package:resonance_network_wallet/generated/version.g.dart';
-import 'package:resonance_network_wallet/providers/account_providers.dart';
-import 'package:resonance_network_wallet/providers/mining_rewards_provider.dart';
-import 'package:resonance_network_wallet/providers/notification_config_provider.dart';
-import 'package:resonance_network_wallet/providers/wallet_providers.dart';
-import 'package:resonance_network_wallet/services/logout_service.dart';
-import 'package:resonance_network_wallet/shared/utils/account_utils.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
-import 'package:resonance_network_wallet/v2/screens/settings/recovery_phrase_screen.dart';
-import 'package:resonance_network_wallet/v2/screens/settings/reset_confirmation_sheet.dart';
-import 'package:resonance_network_wallet/v2/screens/settings/select_wallet_screen.dart';
-import 'package:resonance_network_wallet/v2/screens/settings/testnet_rewards_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/about_quantus_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/account_type_settings_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/help_and_support_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/preferences_settings_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_divider.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_tappable_row.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/wallet_settings_screen.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
-import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
-import 'package:url_launcher/url_launcher.dart';
 
-class SettingsScreenV2 extends ConsumerStatefulWidget {
+class SettingsScreenV2 extends StatelessWidget {
   const SettingsScreenV2({super.key});
 
-  @override
-  ConsumerState<SettingsScreenV2> createState() => _SettingsScreenV2State();
-}
-
-class _SettingsScreenV2State extends ConsumerState<SettingsScreenV2> {
-  final _settingsService = SettingsService();
-  int _reversibleTimeSeconds = 600;
-
-  @override
-  void initState() {
-    super.initState();
-    _loadSettings();
-  }
-
-  Future<void> _loadSettings() async {
-    final revTime = await _settingsService.getReversibleTimeSeconds() ?? 600;
-    if (!mounted) return;
-    setState(() => _reversibleTimeSeconds = revTime);
-  }
-
-  void _toggleNotifications(bool enable) {
-    final current = ref.read(notificationConfigProvider);
-    ref.read(notificationConfigProvider.notifier).updateConfig(current.copyWith(enabled: enable));
-  }
-
-  void _navigateToRecoveryPhrase() {
-    final accountsAsync = ref.read(accountsProvider);
-    accountsAsync.whenData((accounts) {
-      final walletIndices = getNonHardwareWalletIndices(accounts);
-      if (walletIndices.isEmpty) return;
-      if (walletIndices.length == 1) {
-        Navigator.push(
-          context,
-          MaterialPageRoute(builder: (_) => RecoveryPhraseScreen(walletIndex: walletIndices.first)),
-        );
-      } else {
-        Navigator.push(context, MaterialPageRoute(builder: (_) => const SelectWalletScreen()));
-      }
-    });
-  }
-
-  Future<void> _resetAndClearData() async {
-    if (mounted) ref.read(logoutServiceProvider).logout(context);
-  }
-
-  void _showResetConfirmation() {
-    showResetConfirmationSheetV2(context, _resetAndClearData);
-  }
-
-  String _timeLimitLabel() {
-    if (_reversibleTimeSeconds <= 0) return 'Disabled';
-    final mins = _reversibleTimeSeconds ~/ 60;
-    if (mins < 60) return '$mins minutes';
-    final hours = mins ~/ 60;
-    final remMins = mins % 60;
-    return remMins > 0 ? '${hours}h ${remMins}m' : '$hours hours';
-  }
-
   @override
   Widget build(BuildContext context) {
     final colors = context.colors;
-    final text = context.themeText;
-    final notifConfig = ref.watch(notificationConfigProvider);
-    final posMode = ref.watch(posModeProvider);
+    final trailing = SettingsTappableRowUtils.chevron(colors);
+    final entries = _settingsHubItems(colors);
 
     return ScaffoldBase(
       appBar: const V2AppBar(title: 'Settings'),
-      child: ListView(
-        padding: EdgeInsets.zero,
-        children: [
-          _section('Wallet', colors, text, [
-            _chevronItem('Recovery Phase', 'View Backup', colors, text, onTap: _navigateToRecoveryPhrase),
-            _divider(colors),
-            _miningRewardsItem(colors, text),
-          ]),
-          const SizedBox(height: 40),
-          _section('Reversible Transactions', colors, text, [
-            _comingSoonItem('Reversible Transactions', null, colors, text),
-            // _toggleItem(
-            //   'Reversible Transactions',
-            //   'Coming Soon', //_reversibleEnabled ? 'Enabled' : 'Disabled',
-            //   _reversibleEnabled,
-            //   null,
-            //   colors,
-            //   text,
-            // ),
-            _divider(colors),
-            _chevronItem('Time Limit', _timeLimitLabel(), colors, text, onTap: () {}),
-            _divider(colors),
-            _chevronItem('Amount Limit', 'No Limit', colors, text, onTap: () {}),
-          ]),
-          const SizedBox(height: 40),
-          _section('Account Type', colors, text, [
-            _comingSoonItem('High Security Account', 'Guardian Approval', colors, text),
-            _divider(colors),
-            _comingSoonItem('Multi-Signature', 'Multiple Accounts', colors, text),
-            _divider(colors),
-            _comingSoonItem('Hardware Wallet', 'Pair Device', colors, text),
-          ]),
-          const SizedBox(height: 40),
-          _section('Preferences', colors, text, [
-            _toggleItem(
-              'POS Mode',
-              posMode ? 'Point of Sale Enabled' : 'Disabled',
-              posMode,
-              (v) => ref.read(posModeProvider.notifier).setPosMode(v),
-              colors,
-              text,
-            ),
-            _divider(colors),
-            _toggleItem(
-              'Notifications',
-              notifConfig.enabled ? 'Transaction Alerts Enabled' : 'Alerts Disabled',
-              notifConfig.enabled,
-              _toggleNotifications,
-              colors,
-              text,
-            ),
-          ]),
-          const SizedBox(height: 40),
-          _section('About & Support', colors, text, [
-            _externalItem(
-              'Help & Support',
-              null,
-              colors,
-              text,
-              onTap: () => launchUrl(Uri.parse(AppConstants.techSupportUrl)),
-            ),
-            _divider(colors),
-            _externalItem(
-              'Privacy & Terms of Service',
-              null,
-              colors,
-              text,
-              onTap: () => launchUrl(Uri.parse(AppConstants.termsOfServiceUrl)),
-            ),
-          ]),
-          const SizedBox(height: 40),
-          _resetButton(colors, text),
-          const SizedBox(height: 24),
-          Center(
-            child: Text(
-              'Version: $appVersion ($appBuildNumber)',
-              style: text.detail?.copyWith(color: colors.textTertiary),
-            ),
-          ),
-          const SizedBox(height: 48),
-        ],
-      ),
-    );
-  }
-
-  Widget _miningRewardsItem(AppColorsV2 colors, AppTextTheme text) {
-    final miningAsync = ref.watch(miningRewardsProvider);
-    final subtitle = miningAsync.when(
-      skipLoadingOnRefresh: false,
-      data: (data) =>
-          Text('Total: ${data.totalBlocks} blocks', style: text.smallParagraph?.copyWith(color: colors.textTertiary)),
-      loading: () =>
-          const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
-      error: (_, _) => Text('Tap to retry', style: text.smallParagraph?.copyWith(color: colors.textError)),
-    );
-    return GestureDetector(
-      onTap: () {
-        if (miningAsync.hasError) {
-          ref.invalidate(miningRewardsProvider);
-        } else {
-          Navigator.push(context, MaterialPageRoute(builder: (_) => const TestnetRewardsScreen()));
-        }
-      },
-      behavior: HitTestBehavior.opaque,
-      child: Row(
+      mainContent: ListView(
         children: [
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text('Testnet Rewards', style: text.paragraph?.copyWith(color: colors.textPrimary)),
-                const SizedBox(height: 4),
-                subtitle,
-              ],
+          for (final e in entries.asMap().entries) ...[
+            SettingsTappableRow(
+              leading: e.value.leading,
+              title: e.value.title,
+              subtitle: e.value.subtitle,
+              onTap: () => Navigator.push(context, MaterialPageRoute(builder: (_) => e.value.page)),
+              trailing: trailing,
             ),
-          ),
-          Icon(Icons.chevron_right, color: colors.textSecondary, size: 20),
+            if (e.key < entries.length - 1) const SettingsDivider(),
+          ],
         ],
       ),
     );
   }
+}
 
-  Widget _section(String title, AppColorsV2 colors, AppTextTheme text, List<Widget> children) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          title,
-          style: text.paragraph?.copyWith(color: colors.textPrimary, fontWeight: FontWeight.w600),
-        ),
-        const SizedBox(height: 16),
-        Container(
-          padding: const EdgeInsets.all(20),
-          decoration: BoxDecoration(color: colors.surfaceCard, borderRadius: BorderRadius.circular(14)),
-          child: Column(children: children),
-        ),
-      ],
-    );
-  }
-
-  Column _itemContent(String title, AppTextTheme text, AppColorsV2 colors, String? subtitle) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(title, style: text.paragraph?.copyWith(color: colors.textPrimary)),
-        if (subtitle != null) const SizedBox(height: 4),
-        if (subtitle != null) Text(subtitle, style: text.smallParagraph?.copyWith(color: colors.textTertiary)),
-      ],
-    );
-  }
-
-  Widget _toggleItem(
-    String title,
-    String subtitle,
-    bool value,
-    ValueChanged<bool>? onChanged,
-    AppColorsV2 colors,
-    AppTextTheme text,
-  ) {
-    return Row(
-      children: [
-        Expanded(child: _itemContent(title, text, colors, subtitle)),
-        CupertinoSwitch(value: value, onChanged: onChanged, activeTrackColor: colors.accentGreen),
-      ],
-    );
-  }
+class _SettingsHubItem {
+  const _SettingsHubItem({required this.leading, required this.title, required this.subtitle, required this.page});
 
-  Widget _chevronItem(
-    String title,
-    String subtitle,
-    AppColorsV2 colors,
-    AppTextTheme text, {
-    required VoidCallback onTap,
-  }) {
-    return GestureDetector(
-      onTap: onTap,
-      behavior: HitTestBehavior.opaque,
-      child: Row(
-        children: [
-          Expanded(child: _itemContent(title, text, colors, subtitle)),
-          Icon(Icons.chevron_right, color: colors.textSecondary, size: 20),
-        ],
-      ),
-    );
-  }
+  final Widget leading;
+  final String title;
+  final String subtitle;
+  final Widget page;
+}
 
-  Widget _externalItem(
-    String title,
-    String? subtitle,
-    AppColorsV2 colors,
-    AppTextTheme text, {
-    required VoidCallback onTap,
-  }) {
-    return GestureDetector(
-      onTap: onTap,
-      behavior: HitTestBehavior.opaque,
-      child: Row(
-        children: [
-          Expanded(
-            child: subtitle != null
-                ? _itemContent(title, text, colors, subtitle)
-                : Text(title, style: text.paragraph?.copyWith(color: colors.textPrimary)),
-          ),
-          Icon(Icons.north_east, color: colors.textSecondary, size: 20),
-        ],
-      ),
-    );
-  }
+List<_SettingsHubItem> _settingsHubItems(AppColorsV2 colors) {
+  return [
+    _SettingsHubItem(
+      leading: _settingsHubIcon(colors, icon: Icons.account_balance_wallet_outlined),
+      title: 'Wallet',
+      subtitle: 'Recovery Phrase, Reset Wallet',
+      page: const WalletSettingsScreenV2(),
+    ),
+    _SettingsHubItem(
+      leading: _settingsHubIcon(colors, icon: Icons.tune),
+      title: 'Preferences',
+      subtitle: 'Currency, POS mode, notifications',
+      page: const PreferencesSettingsScreenV2(),
+    ),
+    _SettingsHubItem(
+      leading: _settingsHubIcon(colors, icon: Icons.shield_outlined),
+      title: 'Account Type',
+      subtitle: 'Advanced Account Features',
+      page: const AccountTypeSettingsScreenV2(),
+    ),
+    _SettingsHubItem(
+      leading: _settingsHubIcon(colors, icon: Icons.help_outline),
+      title: 'Help & Support',
+      subtitle: 'FAQs, Contact the team',
+      page: const HelpAndSupportScreenV2(),
+    ),
+    _SettingsHubItem(
+      leading: _settingsHubIcon(colors, svg: SvgPicture.asset('assets/v2/uppercase_q.svg', width: 18, height: 18)),
+      title: 'About Quantus',
+      subtitle: 'Version $appVersion ($appBuildNumber)',
+      page: const AboutQuantusScreenV2(),
+    ),
+  ];
+}
 
-  Widget _comingSoonItem(String title, String? subtitle, AppColorsV2 colors, AppTextTheme text) {
-    return Row(
-      children: [
-        Expanded(child: _itemContent(title, text, colors, subtitle)),
-        Text('Coming Soon', style: text.detail?.copyWith(color: colors.textTertiary)),
-      ],
-    );
-  }
+/// 40×40 leading slot: [icon] in accent orange, or a custom [svg].
+Widget _settingsHubIcon(AppColorsV2 colors, {IconData? icon, SvgPicture? svg}) {
+  const double iconSlot = 40;
+  Widget? child;
 
-  Widget _divider(AppColorsV2 colors) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 12),
-      child: Divider(color: colors.separator, height: 1),
-    );
+  if (icon != null) {
+    child = Icon(icon, color: colors.accentOrange, size: 22);
+  } else if (svg != null) {
+    child = svg;
   }
 
-  Widget _resetButton(AppColorsV2 colors, AppTextTheme text) {
-    return GlassButton.simple(label: 'Reset Quantus', onTap: _showResetConfirmation, variant: ButtonVariant.danger);
-  }
+  return SizedBox(
+    width: iconSlot,
+    height: iconSlot,
+    child: Center(child: child),
+  );
 }
diff --git a/mobile-app/lib/v2/screens/settings/settings_tappable_row.dart b/mobile-app/lib/v2/screens/settings/settings_tappable_row.dart
new file mode 100644
index 000000000..c3ed0a6a7
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/settings_tappable_row.dart
@@ -0,0 +1,132 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+abstract final class SettingsTappableRowUtils {
+  static TextStyle? title(AppTextTheme text, AppColorsV2 colors, {Color? color}) {
+    return text.smallTitle?.copyWith(fontWeight: FontWeight.w400, color: color ?? colors.textPrimary);
+  }
+
+  static TextStyle? subtitle(AppTextTheme text, AppColorsV2 colors, {Color? color}) {
+    return text.smallParagraph?.copyWith(color: color ?? colors.textTertiary);
+  }
+
+  static Widget externalLink(AppColorsV2 colors) {
+    return Icon(Icons.north_east, size: 14, color: colors.textLabel);
+  }
+
+  static Widget chevron(AppColorsV2 colors, {double size = 14, Color? color}) {
+    return Icon(Icons.chevron_right, size: size, color: color ?? colors.textSecondary);
+  }
+
+  static const Widget titleGap = SizedBox(height: 2);
+
+  static Widget titleAndSubtitle(
+    String title,
+    String subtitle, {
+    required AppTextTheme text,
+    required AppColorsV2 colors,
+    Color? titleColor,
+    Color? subtitleColor,
+  }) {
+    return Expanded(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(title, style: SettingsTappableRowUtils.title(text, colors, color: titleColor)),
+          SettingsTappableRowUtils.titleGap,
+          Text(subtitle, style: SettingsTappableRowUtils.subtitle(text, colors, color: subtitleColor)),
+        ],
+      ),
+    );
+  }
+}
+
+/// Title + subtitle cell with optional [leading], custom styles, and trailing control.
+class SettingsTappableRow extends StatelessWidget {
+  const SettingsTappableRow({
+    super.key,
+    required this.title,
+    required this.subtitle,
+    required this.onTap,
+    required this.trailing,
+    this.titleColor,
+    this.subtitleColor,
+    this.leading,
+    this.padding,
+  });
+
+  final String title;
+  final Color? titleColor;
+  final String subtitle;
+  final Color? subtitleColor;
+
+  final VoidCallback onTap;
+  final Widget trailing;
+
+  final Widget? leading;
+  final EdgeInsetsGeometry? padding;
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+
+    final row = Row(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        if (leading != null) ...[leading!, const SizedBox(width: 12)],
+        SettingsTappableRowUtils.titleAndSubtitle(
+          title,
+          subtitle,
+          text: text,
+          colors: colors,
+          titleColor: titleColor,
+          subtitleColor: subtitleColor,
+        ),
+        trailing,
+      ],
+    );
+
+    return Material(
+      color: Colors.transparent,
+      child: InkWell(
+        onTap: onTap,
+        borderRadius: BorderRadius.circular(8),
+        child: padding != null ? Padding(padding: padding!, child: row) : row,
+      ),
+    );
+  }
+}
+
+/// Title + subtitle with a [CupertinoSwitch] — no full-row ink splash (toggle handles interaction).
+class SettingsSwitchRow extends StatelessWidget {
+  const SettingsSwitchRow({
+    super.key,
+    required this.title,
+    required this.subtitle,
+    required this.value,
+    required this.onChanged,
+  });
+
+  final String title;
+  final String subtitle;
+  final bool value;
+  final ValueChanged<bool> onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        SettingsTappableRowUtils.titleAndSubtitle(title, subtitle, text: text, colors: colors),
+        CupertinoSwitch(value: value, onChanged: onChanged, activeTrackColor: colors.accentGreen),
+      ],
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/settings/testnet_rewards_screen.dart b/mobile-app/lib/v2/screens/settings/testnet_rewards_screen.dart
index 7963849b0..585603cd3 100644
--- a/mobile-app/lib/v2/screens/settings/testnet_rewards_screen.dart
+++ b/mobile-app/lib/v2/screens/settings/testnet_rewards_screen.dart
@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:resonance_network_wallet/providers/mining_rewards_provider.dart';
 import 'package:resonance_network_wallet/services/mining_rewards_service.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_divider.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
@@ -18,13 +20,13 @@ class TestnetRewardsScreen extends ConsumerWidget {
 
     return ScaffoldBase(
       appBar: const V2AppBar(title: 'Testnet Rewards'),
-      child: miningAsync.when(
+      mainContent: miningAsync.when(
         skipLoadingOnRefresh: false,
         data: (data) => RefreshIndicator(
           onRefresh: () async => ref.invalidate(miningRewardsProvider),
           child: _buildContent(data, colors, text),
         ),
-        loading: () => const Center(child: CircularProgressIndicator()),
+        loading: () => const Center(child: Loader()),
         error: (_, _) => Center(
           child: Column(
             mainAxisSize: MainAxisSize.min,
@@ -89,11 +91,8 @@ class TestnetRewardsScreen extends ConsumerWidget {
           child: Column(
             children: [
               for (var i = 0; i < testnets.length; i++) ...[
-                if (i > 0)
-                  Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 12),
-                    child: Divider(color: colors.separator, height: 1),
-                  ),
+                if (i > 0) const SettingsDivider(style: SettingsDividerStyle.cardInterior),
+
                 Row(
                   children: [
                     Expanded(
diff --git a/mobile-app/lib/v2/screens/settings/wallet_settings_screen.dart b/mobile-app/lib/v2/screens/settings/wallet_settings_screen.dart
new file mode 100644
index 000000000..d956e94b6
--- /dev/null
+++ b/mobile-app/lib/v2/screens/settings/wallet_settings_screen.dart
@@ -0,0 +1,85 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/providers/account_providers.dart';
+import 'package:resonance_network_wallet/shared/extensions/toaster_extensions.dart';
+import 'package:resonance_network_wallet/shared/utils/account_utils.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
+import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/recovery_phrase_confirmation_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/reset_confirmation_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/select_wallet_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_divider.dart';
+import 'package:resonance_network_wallet/v2/screens/settings/settings_tappable_row.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
+
+class WalletSettingsScreenV2 extends ConsumerStatefulWidget {
+  const WalletSettingsScreenV2({super.key});
+
+  @override
+  ConsumerState<WalletSettingsScreenV2> createState() => _WalletSettingsScreenV2State();
+}
+
+class _WalletSettingsScreenV2State extends ConsumerState<WalletSettingsScreenV2> {
+  void _navigateToRecoveryPhrase(List<Account> accounts) {
+    final walletIndices = getNonHardwareWalletIndices(accounts);
+    if (walletIndices.isEmpty) {
+      context.showErrorToaster(message: 'No wallets found');
+      return;
+    }
+
+    if (walletIndices.length == 1) {
+      Navigator.push(
+        context,
+        MaterialPageRoute(builder: (_) => RecoveryPhraseConfirmationScreen(walletIndex: walletIndices.first)),
+      );
+    } else {
+      Navigator.push(context, MaterialPageRoute(builder: (_) => const SelectWalletScreen()));
+    }
+  }
+
+  void _showResetConfirmation() {
+    Navigator.of(context).push(MaterialPageRoute(builder: (_) => const ResetConfirmationScreen()));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.colors;
+    final text = context.themeText;
+    final titleColor = colors.textError;
+    final subtitleColor = const Color(0xFF67231C);
+
+    final accountsAsync = ref.watch(accountsProvider);
+
+    return ScaffoldBase(
+      appBar: const V2AppBar(title: 'Wallet'),
+      mainContent: accountsAsync.when(
+        loading: () => const Center(child: Loader()),
+        error: (e, _) => Center(
+          child: Text('Failed to load wallets', style: text.paragraph?.copyWith(color: colors.textSecondary)),
+        ),
+        data: (accounts) => ListView(
+          children: [
+            SettingsTappableRow(
+              title: 'Recovery Phrase',
+              subtitle: 'View your 24-word Backup Password',
+              onTap: () => _navigateToRecoveryPhrase(accounts),
+              trailing: SettingsTappableRowUtils.chevron(colors),
+            ),
+            const SettingsDivider(style: SettingsDividerStyle.walletSection),
+            SettingsTappableRow(
+              title: 'Reset Wallet',
+              titleColor: titleColor,
+              subtitle: 'Removes all data from this device',
+              subtitleColor: subtitleColor,
+              onTap: _showResetConfirmation,
+              trailing: SettingsTappableRowUtils.chevron(colors, color: titleColor),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/swap/deposit_screen.dart b/mobile-app/lib/v2/screens/swap/deposit_screen.dart
index b16a0fc7c..3d56652f0 100644
--- a/mobile-app/lib/v2/screens/swap/deposit_screen.dart
+++ b/mobile-app/lib/v2/screens/swap/deposit_screen.dart
@@ -3,7 +3,8 @@ import 'package:qr_flutter/qr_flutter.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/shared/extensions/clipboard_extensions.dart';
 import 'package:resonance_network_wallet/shared/utils/share_utils.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/v2/components/token_icon.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/v2/components/v2_app_bar.dart';
@@ -78,7 +79,7 @@ class _DepositScreenState extends State<DepositScreen> {
         title: 'Swap',
         trailing: Icon(Icons.info_outline, color: colors.textPrimary, size: 24),
       ),
-      child: Column(
+      mainContent: Column(
         children: [
           if (_order.status == SwapStatus.complete)
             _completedBody(colors, text)
@@ -182,7 +183,7 @@ class _DepositScreenState extends State<DepositScreen> {
         Row(
           children: [
             Expanded(
-              child: GlassButton.simple(
+              child: QuantusButton.simple(
                 label: 'Copy',
                 variant: ButtonVariant.transparent,
                 onTap: _copyAddress,
@@ -191,7 +192,7 @@ class _DepositScreenState extends State<DepositScreen> {
             ),
             const SizedBox(width: 16),
             Expanded(
-              child: GlassButton.simple(
+              child: QuantusButton.simple(
                 label: 'Share QR',
                 icon: Icon(Icons.qr_code, color: colors.textPrimary, size: 20),
                 variant: ButtonVariant.transparent,
@@ -233,7 +234,7 @@ class _DepositScreenState extends State<DepositScreen> {
     return Column(
       children: [
         const SizedBox(height: 80),
-        CircularProgressIndicator(color: colors.accentGreen),
+        Loader(color: colors.accentGreen),
         const SizedBox(height: 32),
         Text('Processing Swap', style: text.smallTitle?.copyWith(color: colors.textPrimary, fontSize: 20)),
         const SizedBox(height: 12),
@@ -267,7 +268,7 @@ class _DepositScreenState extends State<DepositScreen> {
   }
 
   Widget _sentButton(AppColorsV2 colors, AppTextTheme text) {
-    return GlassButton.simple(
+    return QuantusButton.simple(
       label: "I've sent the funds",
       onTap: _confirmSent,
       variant: ButtonVariant.secondary,
@@ -276,7 +277,7 @@ class _DepositScreenState extends State<DepositScreen> {
   }
 
   Widget _doneButton(AppColorsV2 colors, AppTextTheme text) {
-    return GlassButton.simple(
+    return QuantusButton.simple(
       label: 'Done',
       onTap: () => Navigator.popUntil(context, (r) => r.isFirst),
       variant: ButtonVariant.secondary,
diff --git a/mobile-app/lib/v2/screens/swap/review_quote_sheet.dart b/mobile-app/lib/v2/screens/swap/review_quote_sheet.dart
index f926ff6af..9f80add98 100644
--- a/mobile-app/lib/v2/screens/swap/review_quote_sheet.dart
+++ b/mobile-app/lib/v2/screens/swap/review_quote_sheet.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/v2/components/bottom_sheet_container.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/v2/components/token_icon.dart';
 import 'package:resonance_network_wallet/v2/screens/swap/deposit_screen.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
@@ -131,7 +131,7 @@ class _ReviewQuoteContent extends StatelessWidget {
   }
 
   Widget _confirmButton(BuildContext context, AppColorsV2 colors, AppTextTheme text) {
-    return GlassButton.simple(
+    return QuantusButton.simple(
       label: 'Confirm',
 
       onTap: () async {
diff --git a/mobile-app/lib/v2/screens/swap/swap_screen.dart b/mobile-app/lib/v2/screens/swap/swap_screen.dart
index e5b593e6f..1fc1a4bc1 100644
--- a/mobile-app/lib/v2/screens/swap/swap_screen.dart
+++ b/mobile-app/lib/v2/screens/swap/swap_screen.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/v2/components/qr_scanner_page.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/v2/components/token_icon.dart';
@@ -125,7 +125,7 @@ class _SwapScreenState extends State<SwapScreen> {
         title: 'Swap',
         trailing: Icon(Icons.info_outline, color: colors.textPrimary, size: 24),
       ),
-      child: Column(
+      mainContent: Column(
         children: [
           const SizedBox(height: 24),
           Expanded(
@@ -188,7 +188,7 @@ class _SwapScreenState extends State<SwapScreen> {
             SizedBox(
               width: 119,
               height: 56,
-              child: GlassButton(
+              child: QuantusButton(
                 centered: false,
                 onTap: _pickToken,
                 padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
@@ -268,9 +268,9 @@ class _SwapScreenState extends State<SwapScreen> {
                 ),
               ),
               const SizedBox(width: 8),
-              _smallGlassIconButton(colors: colors, iconAsset: _qrIconAsset, onTap: _scanQr),
+              _smallIconButton(colors: colors, iconAsset: _qrIconAsset, onTap: _scanQr),
               const SizedBox(width: 8),
-              _smallGlassIconButton(
+              _smallIconButton(
                 colors: colors,
                 iconAsset: _historyIconAsset,
                 onTap: () async {
@@ -295,18 +295,18 @@ class _SwapScreenState extends State<SwapScreen> {
         SizedBox(
           width: 40,
           height: 40,
-          child: _smallGlassIconButton(colors: colors, iconAsset: _swapDirectionIconAsset, onTap: () {}),
+          child: _smallIconButton(colors: colors, iconAsset: _swapDirectionIconAsset, onTap: () {}),
         ),
         Expanded(child: Divider(color: colors.separator)),
       ],
     );
   }
 
-  Widget _smallGlassIconButton({required AppColorsV2 colors, required String iconAsset, VoidCallback? onTap}) {
+  Widget _smallIconButton({required AppColorsV2 colors, required String iconAsset, VoidCallback? onTap}) {
     return SizedBox(
       width: 40,
       height: 40,
-      child: GlassButton(
+      child: QuantusButton(
         onTap: onTap,
         padding: EdgeInsets.zero,
         borderRadius: 8,
@@ -349,7 +349,7 @@ class _SwapScreenState extends State<SwapScreen> {
             SizedBox(
               width: 119,
               height: 56,
-              child: GlassButton(
+              child: QuantusButton(
                 centered: false,
                 onTap: () {},
                 padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
@@ -415,7 +415,7 @@ class _SwapScreenState extends State<SwapScreen> {
 
   Widget _quoteButton(AppColorsV2 colors, AppTextTheme text) {
     final enabled = _canGetQuote && !_loading;
-    return GlassButton.simple(
+    return QuantusButton.simple(
       label: 'Get a Quote',
       onTap: _getQuote,
       isDisabled: !enabled,
diff --git a/mobile-app/lib/v2/screens/swap/token_picker_sheet.dart b/mobile-app/lib/v2/screens/swap/token_picker_sheet.dart
index a133e7cf1..7ab5ca73d 100644
--- a/mobile-app/lib/v2/screens/swap/token_picker_sheet.dart
+++ b/mobile-app/lib/v2/screens/swap/token_picker_sheet.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/v2/components/bottom_sheet_container.dart';
+import 'package:resonance_network_wallet/v2/components/loader.dart';
 import 'package:resonance_network_wallet/v2/components/token_icon.dart';
 import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
 import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
@@ -86,7 +87,7 @@ class _TokenPickerContentState extends State<_TokenPickerContent> {
 
   Widget _content(AppColorsV2 colors, AppTextTheme text) {
     if (_loading && _tokens.isEmpty) {
-      return Center(child: CircularProgressIndicator(color: colors.textPrimary, strokeWidth: 2));
+      return const Center(child: Loader());
     }
     if (_error != null && _tokens.isEmpty) {
       return Center(
diff --git a/mobile-app/lib/v2/screens/welcome/onboarding_background.dart b/mobile-app/lib/v2/screens/welcome/onboarding_background.dart
new file mode 100644
index 000000000..3bb243a2b
--- /dev/null
+++ b/mobile-app/lib/v2/screens/welcome/onboarding_background.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:resonance_network_wallet/v2/theme/app_colors.dart';
+
+class OnboardingBackground extends StatelessWidget {
+  const OnboardingBackground({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        Image.asset('assets/v2/ascii_background.png', fit: BoxFit.cover),
+        DecoratedBox(
+          decoration: BoxDecoration(
+            gradient: LinearGradient(
+              begin: Alignment.topCenter,
+              end: Alignment.bottomCenter,
+              colors: [Colors.transparent, context.colors.background],
+              stops: [0, 0.75],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/mobile-app/lib/v2/screens/welcome/welcome_screen.dart b/mobile-app/lib/v2/screens/welcome/welcome_screen.dart
index 98fe682b3..a98f71469 100644
--- a/mobile-app/lib/v2/screens/welcome/welcome_screen.dart
+++ b/mobile-app/lib/v2/screens/welcome/welcome_screen.dart
@@ -1,42 +1,33 @@
 import 'package:flutter/material.dart';
-import 'package:resonance_network_wallet/shared/extensions/media_query_data_extension.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
-import 'package:resonance_network_wallet/v2/components/gradient_background.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/v2/screens/create/wallet_ready_screen.dart';
 import 'package:resonance_network_wallet/v2/screens/import/import_wallet_screen.dart';
+import 'package:resonance_network_wallet/v2/screens/welcome/onboarding_background.dart';
+import 'package:resonance_network_wallet/v2/theme/app_text_styles.dart';
 
 class WelcomeScreenV2 extends StatelessWidget {
   const WelcomeScreenV2({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final isTablet = context.isTablet;
-
-    final background = isTablet
-        ? const GradientBackground(child: SizedBox.expand())
-        : Image.asset('assets/v2/welcome_screen_bg_image.jpg', fit: BoxFit.cover) as Widget;
-
     return ScaffoldBase(
-      backgroundWidget: background,
-      child: Column(
+      backgroundWidget: const OnboardingBackground(),
+      mainContent: Column(
+        mainAxisAlignment: MainAxisAlignment.end,
         children: [
-          const Spacer(),
-          Image.asset('assets/v2/quantus_orange_logo.png', height: 40),
-          const SizedBox(height: 11),
-          Text(
-            'Quantum Secure Your Crypto',
-            textAlign: TextAlign.center,
-            style: TextStyle(
-              // custom text style for the welcome screen
-              fontSize: 20,
-              fontWeight: FontWeight.w300,
-              height: 1.35,
-              color: Colors.white.withValues(alpha: 0.5),
+          Image.asset('assets/v2/quantus_orange_logo.png', height: 32),
+          const SizedBox(height: 16),
+          SizedBox(
+            width: 210,
+            child: Text(
+              'Quantum Secure Encrypted Money',
+              textAlign: TextAlign.center,
+              style: context.themeText.mediumTitle,
             ),
           ),
-          const SizedBox(height: 220),
-          GlassButton.simple(
+          const SizedBox(height: 56),
+          QuantusButton.simple(
             label: 'Create New Wallet',
             onTap: () => Navigator.push(
               context,
@@ -46,9 +37,9 @@ class WelcomeScreenV2 extends StatelessWidget {
               ),
             ),
           ),
-          const SizedBox(height: 32),
-          GlassButton.simple(
-            label: 'Import Existing Wallet',
+          const SizedBox(height: 24),
+          QuantusButton.simple(
+            label: 'Import Wallet',
             onTap: () => Navigator.push(
               context,
               MaterialPageRoute(
@@ -58,7 +49,7 @@ class WelcomeScreenV2 extends StatelessWidget {
             ),
             variant: ButtonVariant.secondary,
           ),
-          const SizedBox(height: 60),
+          const SizedBox(height: 40),
         ],
       ),
     );
diff --git a/mobile-app/lib/v2/theme/app_colors.dart b/mobile-app/lib/v2/theme/app_colors.dart
index 8e81b6566..89cd2b904 100644
--- a/mobile-app/lib/v2/theme/app_colors.dart
+++ b/mobile-app/lib/v2/theme/app_colors.dart
@@ -4,8 +4,6 @@ import 'package:flutter/material.dart';
 class AppColorsV2 extends ThemeExtension<AppColorsV2> {
   // Backgrounds
   final Color background;
-  final Color backgroundAlt;
-  final Color toasterBackground;
 
   // Surfaces
   final Color surface;
@@ -16,11 +14,13 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
   final Color textPrimary;
   final Color textSecondary;
   final Color textTertiary;
+  final Color textMuted;
   final Color textError;
+  final Color textLabel;
 
   // Accents
+  final Color accentOrange;
   final Color accentGreen;
-  final Color accentPink;
   final Color checksum;
 
   // Semantic
@@ -35,16 +35,32 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
   // UI elements
   final Color separator;
   final Color txItemSeparator;
+  final Color txItemIncomingHighlightBg;
+  final Color txItemOutgoingHighlightBg;
+  final Color txItemOutgoingHighlightBorder;
+  final Color txItemIconDefault;
+  final Color txItemIncomingHighlightBorder;
+  final Color txItemBorderDefault;
   final Color border;
   final Color buttonDisabled;
   final Color buttonDanger;
   final Color skeletonBase;
   final Color skeletonHighlight;
   final Color toasterBorder;
+  final Color toasterBackground;
   final Color sheetBackground;
+  final Color borderButton;
   final Color borderSubtle;
   final Color borderDanger;
 
+  // Segmented control
+  final Color segmentedControlPill;
+
+  // Receive screen
+  final Color surfaceDeep;
+  final Color copyButtonCopiedBg;
+  final Color copyButtonCopiedBorder;
+
   // Account tags
   final Color tagGuardian;
   final Color tagEntrusted;
@@ -52,21 +68,23 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
 
   const AppColorsV2({
     required this.background,
-    required this.backgroundAlt,
     required this.toasterBackground,
     required this.toasterBorder,
     required this.sheetBackground,
     required this.borderSubtle,
     required this.borderDanger,
+    required this.borderButton,
     required this.surface,
     required this.surfaceGlass,
     required this.surfaceCard,
     required this.textPrimary,
     required this.textSecondary,
     required this.textTertiary,
+    required this.textMuted,
     required this.textError,
+    required this.textLabel,
+    required this.accentOrange,
     required this.accentGreen,
-    required this.accentPink,
     required this.checksum,
     required this.error,
     required this.danger,
@@ -75,11 +93,21 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
     required this.buttonPrimaryGradient,
     required this.separator,
     required this.txItemSeparator,
+    required this.txItemIncomingHighlightBg,
+    required this.txItemOutgoingHighlightBg,
+    required this.txItemOutgoingHighlightBorder,
+    required this.txItemIconDefault,
+    required this.txItemIncomingHighlightBorder,
+    required this.txItemBorderDefault,
     required this.border,
     required this.buttonDisabled,
     required this.buttonDanger,
     required this.skeletonBase,
     required this.skeletonHighlight,
+    required this.segmentedControlPill,
+    required this.surfaceDeep,
+    required this.copyButtonCopiedBg,
+    required this.copyButtonCopiedBorder,
     required this.tagGuardian,
     required this.tagEntrusted,
     required this.tagHighSecurity,
@@ -87,31 +115,43 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
 
   const AppColorsV2.dark()
     : this(
-        background: const Color(0xFF141414),
-        backgroundAlt: const Color(0xFF1F1F1F),
-        toasterBackground: const Color(0xFF191919),
-        toasterBorder: const Color(0xFF3D3D3D),
+        background: const Color(0xFF0E0E0E),
+        toasterBackground: const Color(0xFF181818),
+        toasterBorder: const Color(0xFF272727),
         sheetBackground: const Color(0xFF1A1A1A),
+        border: const Color(0x33FFFFFF),
         borderSubtle: const Color(0x70FFFFFF),
         borderDanger: const Color(0x70FF0000),
+        borderButton: const Color(0xFF272727),
         surface: const Color(0xFF292929),
         surfaceGlass: const Color(0x1AFFFFFF),
         surfaceCard: const Color(0x0FFFFFFF),
         textPrimary: const Color(0xFFFFFFFF),
         textSecondary: const Color(0x80FFFFFF),
-        textTertiary: const Color(0x52FFFFFF),
-        textError: const Color(0xFFFF5252),
+        textTertiary: const Color(0xFF3D3D3D),
+        textMuted: const Color(0xFF888888),
+        textError: const Color(0xFFC0392B),
+        textLabel: const Color(0xFF787878),
+        accentOrange: const Color(0xFFFF6B35),
         accentGreen: const Color(0xFF34C759),
-        accentPink: const Color(0xFFED4CCE),
-        checksum: const Color(0xFF4CEDE7),
+        checksum: const Color(0xFF95A7FB),
         error: const Color(0xFFFF2D54),
         danger: const Color(0xFFFF1F45),
-        success: const Color(0xFF1FFFA7),
+        success: const Color(0xFF22A27F),
         backgroundGlow: const Color(0xFFFFFFFF),
         buttonPrimaryGradient: const [Color(0xFF0000FF), Color(0xFFED4CCE)],
         separator: const Color(0x1AFFFFFF),
-        txItemSeparator: const Color(0x05FFFFFF),
-        border: const Color(0x33FFFFFF),
+        txItemSeparator: const Color(0x7F272727),
+        txItemIncomingHighlightBg: const Color(0x14408C6B),
+        txItemOutgoingHighlightBg: const Color(0x1440618C),
+        txItemOutgoingHighlightBorder: const Color(0x2640618C),
+        txItemIconDefault: const Color(0xFF363636),
+        txItemIncomingHighlightBorder: const Color(0x26408C6B),
+        txItemBorderDefault: const Color(0xFF191919),
+        segmentedControlPill: const Color(0xFF1C1C1C),
+        surfaceDeep: const Color(0xFF141414),
+        copyButtonCopiedBg: const Color(0xFF0C1C14),
+        copyButtonCopiedBorder: const Color(0xFF1A3226),
         buttonDisabled: const Color(0xFF3D3C44),
         buttonDanger: const Color(0x1AFF0000),
         skeletonBase: const Color(0xFF3D3C44),
@@ -124,16 +164,17 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
   @override
   AppColorsV2 copyWith({
     Color? background,
-    Color? backgroundAlt,
     Color? surface,
     Color? surfaceGlass,
     Color? surfaceCard,
     Color? textPrimary,
     Color? textSecondary,
     Color? textTertiary,
+    Color? textMuted,
     Color? textError,
+    Color? textLabel,
+    Color? accentOrange,
     Color? accentGreen,
-    Color? accentPink,
     Color? checksum,
     Color? error,
     Color? danger,
@@ -142,7 +183,14 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
     List<Color>? buttonPrimaryGradient,
     Color? separator,
     Color? txItemSeparator,
+    Color? txItemIncomingHighlightBg,
+    Color? txItemOutgoingHighlightBg,
+    Color? txItemOutgoingHighlightBorder,
+    Color? txItemIconDefault,
+    Color? txItemIncomingHighlightBorder,
+    Color? txItemBorderDefault,
     Color? border,
+    Color? borderButton,
     Color? toasterBackground,
     Color? toasterBorder,
     Color? sheetBackground,
@@ -152,26 +200,32 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
     Color? borderDanger,
     Color? skeletonBase,
     Color? skeletonHighlight,
+    Color? segmentedControlPill,
+    Color? surfaceDeep,
+    Color? copyButtonCopiedBg,
+    Color? copyButtonCopiedBorder,
     Color? tagGuardian,
     Color? tagEntrusted,
     Color? tagHighSecurity,
   }) {
     return AppColorsV2(
       background: background ?? this.background,
-      backgroundAlt: backgroundAlt ?? this.backgroundAlt,
       toasterBackground: toasterBackground ?? this.toasterBackground,
       toasterBorder: toasterBorder ?? this.toasterBorder,
       sheetBackground: sheetBackground ?? this.sheetBackground,
       borderSubtle: borderSubtle ?? this.borderSubtle,
+      borderButton: borderButton ?? this.borderButton,
       surface: surface ?? this.surface,
       surfaceGlass: surfaceGlass ?? this.surfaceGlass,
       surfaceCard: surfaceCard ?? this.surfaceCard,
       textPrimary: textPrimary ?? this.textPrimary,
       textSecondary: textSecondary ?? this.textSecondary,
       textTertiary: textTertiary ?? this.textTertiary,
+      textMuted: textMuted ?? this.textMuted,
       textError: textError ?? this.textError,
+      textLabel: textLabel ?? this.textLabel,
+      accentOrange: accentOrange ?? this.accentOrange,
       accentGreen: accentGreen ?? this.accentGreen,
-      accentPink: accentPink ?? this.accentPink,
       checksum: checksum ?? this.checksum,
       error: error ?? this.error,
       danger: danger ?? this.danger,
@@ -180,12 +234,22 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
       buttonPrimaryGradient: buttonPrimaryGradient ?? this.buttonPrimaryGradient,
       separator: separator ?? this.separator,
       txItemSeparator: txItemSeparator ?? this.txItemSeparator,
+      txItemIncomingHighlightBg: txItemIncomingHighlightBg ?? this.txItemIncomingHighlightBg,
+      txItemOutgoingHighlightBg: txItemOutgoingHighlightBg ?? this.txItemOutgoingHighlightBg,
+      txItemOutgoingHighlightBorder: txItemOutgoingHighlightBorder ?? this.txItemOutgoingHighlightBorder,
+      txItemIconDefault: txItemIconDefault ?? this.txItemIconDefault,
+      txItemIncomingHighlightBorder: txItemIncomingHighlightBorder ?? this.txItemIncomingHighlightBorder,
+      txItemBorderDefault: txItemBorderDefault ?? this.txItemBorderDefault,
       border: border ?? this.border,
       buttonDisabled: buttonDisabled ?? this.buttonDisabled,
       buttonDanger: buttonDanger ?? this.buttonDanger,
       borderDanger: borderDanger ?? this.borderDanger,
       skeletonBase: skeletonBase ?? this.skeletonBase,
       skeletonHighlight: skeletonHighlight ?? this.skeletonHighlight,
+      segmentedControlPill: segmentedControlPill ?? this.segmentedControlPill,
+      surfaceDeep: surfaceDeep ?? this.surfaceDeep,
+      copyButtonCopiedBg: copyButtonCopiedBg ?? this.copyButtonCopiedBg,
+      copyButtonCopiedBorder: copyButtonCopiedBorder ?? this.copyButtonCopiedBorder,
       tagGuardian: tagGuardian ?? this.tagGuardian,
       tagEntrusted: tagEntrusted ?? this.tagEntrusted,
       tagHighSecurity: tagHighSecurity ?? this.tagHighSecurity,
@@ -197,20 +261,22 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
     if (other is! AppColorsV2) return this;
     return AppColorsV2(
       background: Color.lerp(background, other.background, t) ?? background,
-      backgroundAlt: Color.lerp(backgroundAlt, other.backgroundAlt, t) ?? backgroundAlt,
       toasterBackground: Color.lerp(toasterBackground, other.toasterBackground, t) ?? toasterBackground,
       toasterBorder: Color.lerp(toasterBorder, other.toasterBorder, t) ?? toasterBorder,
       sheetBackground: Color.lerp(sheetBackground, other.sheetBackground, t) ?? sheetBackground,
       borderSubtle: Color.lerp(borderSubtle, other.borderSubtle, t) ?? borderSubtle,
+      borderButton: Color.lerp(borderButton, other.borderButton, t) ?? borderButton,
       surface: Color.lerp(surface, other.surface, t) ?? surface,
       surfaceGlass: Color.lerp(surfaceGlass, other.surfaceGlass, t) ?? surfaceGlass,
       surfaceCard: Color.lerp(surfaceCard, other.surfaceCard, t) ?? surfaceCard,
       textPrimary: Color.lerp(textPrimary, other.textPrimary, t) ?? textPrimary,
       textSecondary: Color.lerp(textSecondary, other.textSecondary, t) ?? textSecondary,
       textTertiary: Color.lerp(textTertiary, other.textTertiary, t) ?? textTertiary,
+      textMuted: Color.lerp(textMuted, other.textMuted, t) ?? textMuted,
       textError: Color.lerp(textError, other.textError, t) ?? textError,
+      textLabel: Color.lerp(textLabel, other.textLabel, t) ?? textLabel,
+      accentOrange: Color.lerp(accentOrange, other.accentOrange, t) ?? accentOrange,
       accentGreen: Color.lerp(accentGreen, other.accentGreen, t) ?? accentGreen,
-      accentPink: Color.lerp(accentPink, other.accentPink, t) ?? accentPink,
       checksum: Color.lerp(checksum, other.checksum, t) ?? checksum,
       error: Color.lerp(error, other.error, t) ?? error,
       danger: Color.lerp(danger, other.danger, t) ?? danger,
@@ -219,12 +285,29 @@ class AppColorsV2 extends ThemeExtension<AppColorsV2> {
       buttonPrimaryGradient: other.buttonPrimaryGradient,
       separator: Color.lerp(separator, other.separator, t) ?? separator,
       txItemSeparator: Color.lerp(txItemSeparator, other.txItemSeparator, t) ?? txItemSeparator,
+      txItemIncomingHighlightBg:
+          Color.lerp(txItemIncomingHighlightBg, other.txItemIncomingHighlightBg, t) ?? txItemIncomingHighlightBg,
+      txItemOutgoingHighlightBg:
+          Color.lerp(txItemOutgoingHighlightBg, other.txItemOutgoingHighlightBg, t) ?? txItemOutgoingHighlightBg,
+      txItemOutgoingHighlightBorder:
+          Color.lerp(txItemOutgoingHighlightBorder, other.txItemOutgoingHighlightBorder, t) ??
+          txItemOutgoingHighlightBorder,
+      txItemIconDefault: Color.lerp(txItemIconDefault, other.txItemIconDefault, t) ?? txItemIconDefault,
+      txItemIncomingHighlightBorder:
+          Color.lerp(txItemIncomingHighlightBorder, other.txItemIncomingHighlightBorder, t) ??
+          txItemIncomingHighlightBorder,
+      txItemBorderDefault: Color.lerp(txItemBorderDefault, other.txItemBorderDefault, t) ?? txItemBorderDefault,
       border: Color.lerp(border, other.border, t) ?? border,
       buttonDisabled: Color.lerp(buttonDisabled, other.buttonDisabled, t) ?? buttonDisabled,
       buttonDanger: Color.lerp(buttonDanger, other.buttonDanger, t) ?? buttonDanger,
       borderDanger: Color.lerp(borderDanger, other.borderDanger, t) ?? borderDanger,
       skeletonBase: Color.lerp(skeletonBase, other.skeletonBase, t) ?? skeletonBase,
       skeletonHighlight: Color.lerp(skeletonHighlight, other.skeletonHighlight, t) ?? skeletonHighlight,
+      segmentedControlPill: Color.lerp(segmentedControlPill, other.segmentedControlPill, t) ?? segmentedControlPill,
+      surfaceDeep: Color.lerp(surfaceDeep, other.surfaceDeep, t) ?? surfaceDeep,
+      copyButtonCopiedBg: Color.lerp(copyButtonCopiedBg, other.copyButtonCopiedBg, t) ?? copyButtonCopiedBg,
+      copyButtonCopiedBorder:
+          Color.lerp(copyButtonCopiedBorder, other.copyButtonCopiedBorder, t) ?? copyButtonCopiedBorder,
       tagGuardian: Color.lerp(tagGuardian, other.tagGuardian, t) ?? tagGuardian,
       tagEntrusted: Color.lerp(tagEntrusted, other.tagEntrusted, t) ?? tagEntrusted,
       tagHighSecurity: Color.lerp(tagHighSecurity, other.tagHighSecurity, t) ?? tagHighSecurity,
diff --git a/mobile-app/lib/v2/theme/app_text_styles.dart b/mobile-app/lib/v2/theme/app_text_styles.dart
index 2771ad066..382d9b0f2 100644
--- a/mobile-app/lib/v2/theme/app_text_styles.dart
+++ b/mobile-app/lib/v2/theme/app_text_styles.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 
-const _fontFamily = 'Inter';
-
 @immutable
 class AppTextTheme extends ThemeExtension<AppTextTheme> {
+  static const fontFamily = 'Geist';
+  static const fontFamilySecondary = 'Geist Mono';
+
   final TextStyle? lockTitle;
   final TextStyle? extraLargeTitle;
   final TextStyle? largeTitle;
@@ -11,11 +12,18 @@ class AppTextTheme extends ThemeExtension<AppTextTheme> {
   final TextStyle? smallTitle;
   final TextStyle? paragraph;
   final TextStyle? smallParagraph;
+  final TextStyle? receiveLabel;
   final TextStyle? largeTag;
   final TextStyle? tag;
   final TextStyle? timer;
   final TextStyle? detail;
   final TextStyle? tiny;
+  final TextStyle? transactionDetailAmountPrimary;
+  final TextStyle? transactionDetailAmountSymbol;
+  final TextStyle? transactionDetailRowLabel;
+  final TextStyle? transactionDetailRowValue;
+  final TextStyle? sendSectionLabel;
+  final TextStyle? conversionAmountPrimary;
 
   const AppTextTheme({
     this.lockTitle,
@@ -25,43 +33,120 @@ class AppTextTheme extends ThemeExtension<AppTextTheme> {
     this.smallTitle,
     this.paragraph,
     this.smallParagraph,
+    this.receiveLabel,
     this.largeTag,
     this.tag,
     this.timer,
     this.detail,
     this.tiny,
+    this.transactionDetailAmountPrimary,
+    this.transactionDetailAmountSymbol,
+    this.transactionDetailRowLabel,
+    this.transactionDetailRowValue,
+    this.sendSectionLabel,
+    this.conversionAmountPrimary,
   });
 
   const AppTextTheme.defaultTheme()
     : this(
-        lockTitle: const TextStyle(fontSize: 24, fontFamily: _fontFamily),
-        extraLargeTitle: const TextStyle(fontSize: 40, fontFamily: _fontFamily, fontWeight: FontWeight.w600),
-        largeTitle: const TextStyle(fontSize: 30, fontFamily: _fontFamily, fontWeight: FontWeight.w300),
-        mediumTitle: const TextStyle(fontSize: 24, fontFamily: _fontFamily, fontWeight: FontWeight.w500),
-        smallTitle: const TextStyle(fontSize: 18, fontWeight: FontWeight.w500, fontFamily: _fontFamily),
-        paragraph: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, fontFamily: _fontFamily),
-        smallParagraph: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, fontFamily: _fontFamily),
-        largeTag: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, fontFamily: _fontFamily),
-        tag: const TextStyle(fontSize: 12, fontWeight: FontWeight.w300, fontFamily: _fontFamily),
-        timer: const TextStyle(fontSize: 28, fontWeight: FontWeight.w600, fontFamily: _fontFamily),
-        detail: const TextStyle(fontSize: 12, fontWeight: FontWeight.w400, fontFamily: _fontFamily),
-        tiny: const TextStyle(fontSize: 11, fontWeight: FontWeight.w400, fontFamily: _fontFamily),
+        lockTitle: const TextStyle(fontSize: 24, fontFamily: fontFamily),
+        extraLargeTitle: const TextStyle(fontSize: 40, fontFamily: fontFamily, fontWeight: FontWeight.w600),
+        largeTitle: const TextStyle(fontSize: 30, fontFamily: fontFamily, fontWeight: FontWeight.w300),
+        mediumTitle: const TextStyle(fontSize: 24, fontFamily: fontFamily, fontWeight: FontWeight.w500),
+        smallTitle: const TextStyle(fontSize: 18, fontWeight: FontWeight.w500, fontFamily: fontFamily),
+        paragraph: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, fontFamily: fontFamily),
+        smallParagraph: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, fontFamily: fontFamily),
+        receiveLabel: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500, fontFamily: fontFamilySecondary),
+        largeTag: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, fontFamily: fontFamily),
+        tag: const TextStyle(fontSize: 12, fontWeight: FontWeight.w300, fontFamily: fontFamily),
+        timer: const TextStyle(fontSize: 28, fontWeight: FontWeight.w600, fontFamily: fontFamily),
+        detail: const TextStyle(fontSize: 12, fontWeight: FontWeight.w400, fontFamily: fontFamily),
+        tiny: const TextStyle(fontSize: 11, fontWeight: FontWeight.w400, fontFamily: fontFamily),
+        transactionDetailAmountPrimary: const TextStyle(
+          fontFamily: fontFamilySecondary,
+          fontSize: 64,
+          fontWeight: FontWeight.w300,
+          letterSpacing: -2.77,
+          height: 1.0,
+        ),
+        transactionDetailAmountSymbol: const TextStyle(
+          fontFamily: fontFamilySecondary,
+          fontSize: 24,
+          fontWeight: FontWeight.w300,
+        ),
+        transactionDetailRowLabel: const TextStyle(
+          fontFamily: fontFamilySecondary,
+          fontSize: 12,
+          fontWeight: FontWeight.w400,
+          letterSpacing: 0.85,
+        ),
+        transactionDetailRowValue: const TextStyle(
+          fontFamily: fontFamilySecondary,
+          fontSize: 12,
+          fontWeight: FontWeight.w500,
+        ),
+        sendSectionLabel: const TextStyle(
+          fontSize: 20,
+          height: 1.0,
+          fontWeight: FontWeight.w400,
+          fontFamily: fontFamily,
+        ),
+        conversionAmountPrimary: const TextStyle(
+          fontSize: 40,
+          fontFamily: fontFamilySecondary,
+          fontWeight: FontWeight.w400,
+        ),
       );
 
   const AppTextTheme.iPad()
     : this(
-        lockTitle: const TextStyle(color: Colors.white, fontSize: 28, fontFamily: _fontFamily),
-        extraLargeTitle: const TextStyle(fontSize: 52, fontFamily: _fontFamily, fontWeight: FontWeight.w600),
-        largeTitle: const TextStyle(fontSize: 36, fontFamily: _fontFamily, fontWeight: FontWeight.w300),
-        mediumTitle: const TextStyle(fontSize: 28, fontFamily: _fontFamily, fontWeight: FontWeight.w400),
-        smallTitle: const TextStyle(fontSize: 24, fontWeight: FontWeight.w500, fontFamily: _fontFamily),
-        paragraph: const TextStyle(fontSize: 20, fontWeight: FontWeight.w400, fontFamily: _fontFamily),
-        smallParagraph: const TextStyle(fontSize: 18, fontWeight: FontWeight.w400, fontFamily: _fontFamily),
-        largeTag: const TextStyle(fontSize: 24, fontWeight: FontWeight.w400, fontFamily: _fontFamily),
-        tag: const TextStyle(fontSize: 16, fontWeight: FontWeight.w300, fontFamily: _fontFamily),
-        timer: const TextStyle(fontSize: 36, fontWeight: FontWeight.w600, fontFamily: _fontFamily),
-        detail: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, fontFamily: _fontFamily),
-        tiny: const TextStyle(fontSize: 15, fontWeight: FontWeight.w400, fontFamily: _fontFamily),
+        lockTitle: const TextStyle(color: Colors.white, fontSize: 28, fontFamily: fontFamily),
+        extraLargeTitle: const TextStyle(fontSize: 52, fontFamily: fontFamily, fontWeight: FontWeight.w600),
+        largeTitle: const TextStyle(fontSize: 36, fontFamily: fontFamily, fontWeight: FontWeight.w300),
+        mediumTitle: const TextStyle(fontSize: 28, fontFamily: fontFamily, fontWeight: FontWeight.w400),
+        smallTitle: const TextStyle(fontSize: 24, fontWeight: FontWeight.w500, fontFamily: fontFamily),
+        paragraph: const TextStyle(fontSize: 20, fontWeight: FontWeight.w400, fontFamily: fontFamily),
+        smallParagraph: const TextStyle(fontSize: 18, fontWeight: FontWeight.w400, fontFamily: fontFamily),
+        receiveLabel: const TextStyle(fontSize: 18, fontWeight: FontWeight.w500, fontFamily: fontFamilySecondary),
+        largeTag: const TextStyle(fontSize: 24, fontWeight: FontWeight.w400, fontFamily: fontFamily),
+        tag: const TextStyle(fontSize: 16, fontWeight: FontWeight.w300, fontFamily: fontFamily),
+        timer: const TextStyle(fontSize: 36, fontWeight: FontWeight.w600, fontFamily: fontFamily),
+        detail: const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, fontFamily: fontFamily),
+        tiny: const TextStyle(fontSize: 15, fontWeight: FontWeight.w400, fontFamily: fontFamily),
+        transactionDetailAmountPrimary: const TextStyle(
+          fontFamily: fontFamilySecondary,
+          fontSize: 80,
+          fontWeight: FontWeight.w300,
+          letterSpacing: -2.77,
+          height: 1.0,
+        ),
+        transactionDetailAmountSymbol: const TextStyle(
+          fontFamily: fontFamilySecondary,
+          fontSize: 30,
+          fontWeight: FontWeight.w300,
+        ),
+        transactionDetailRowLabel: const TextStyle(
+          fontFamily: fontFamilySecondary,
+          fontSize: 16,
+          fontWeight: FontWeight.w400,
+          letterSpacing: 0.85,
+        ),
+        transactionDetailRowValue: const TextStyle(
+          fontFamily: fontFamilySecondary,
+          fontSize: 16,
+          fontWeight: FontWeight.w500,
+        ),
+        sendSectionLabel: const TextStyle(
+          fontSize: 24,
+          height: 1.0,
+          fontWeight: FontWeight.w400,
+          fontFamily: fontFamily,
+        ),
+        conversionAmountPrimary: const TextStyle(
+          fontSize: 52,
+          fontFamily: fontFamilySecondary,
+          fontWeight: FontWeight.w400,
+        ),
       );
 
   @override
@@ -73,11 +158,18 @@ class AppTextTheme extends ThemeExtension<AppTextTheme> {
     TextStyle? smallTitle,
     TextStyle? paragraph,
     TextStyle? smallParagraph,
+    TextStyle? receiveLabel,
     TextStyle? largeTag,
     TextStyle? tag,
     TextStyle? timer,
     TextStyle? detail,
     TextStyle? tiny,
+    TextStyle? transactionDetailAmountPrimary,
+    TextStyle? transactionDetailAmountSymbol,
+    TextStyle? transactionDetailRowLabel,
+    TextStyle? transactionDetailRowValue,
+    TextStyle? sendSectionLabel,
+    TextStyle? conversionAmountPrimary,
   }) {
     return AppTextTheme(
       lockTitle: lockTitle ?? this.lockTitle,
@@ -87,11 +179,18 @@ class AppTextTheme extends ThemeExtension<AppTextTheme> {
       smallTitle: smallTitle ?? this.smallTitle,
       paragraph: paragraph ?? this.paragraph,
       smallParagraph: smallParagraph ?? this.smallParagraph,
+      receiveLabel: receiveLabel ?? this.receiveLabel,
       largeTag: largeTag ?? this.largeTag,
       tag: tag ?? this.tag,
       timer: timer ?? this.timer,
       detail: detail ?? this.detail,
       tiny: tiny ?? this.tiny,
+      transactionDetailAmountPrimary: transactionDetailAmountPrimary ?? this.transactionDetailAmountPrimary,
+      transactionDetailAmountSymbol: transactionDetailAmountSymbol ?? this.transactionDetailAmountSymbol,
+      transactionDetailRowLabel: transactionDetailRowLabel ?? this.transactionDetailRowLabel,
+      transactionDetailRowValue: transactionDetailRowValue ?? this.transactionDetailRowValue,
+      sendSectionLabel: sendSectionLabel ?? this.sendSectionLabel,
+      conversionAmountPrimary: conversionAmountPrimary ?? this.conversionAmountPrimary,
     );
   }
 
@@ -106,11 +205,26 @@ class AppTextTheme extends ThemeExtension<AppTextTheme> {
       smallTitle: TextStyle.lerp(smallTitle, other.smallTitle, t),
       paragraph: TextStyle.lerp(paragraph, other.paragraph, t),
       smallParagraph: TextStyle.lerp(smallParagraph, other.smallParagraph, t),
+      receiveLabel: TextStyle.lerp(receiveLabel, other.receiveLabel, t),
       largeTag: TextStyle.lerp(largeTag, other.largeTag, t),
       tag: TextStyle.lerp(tag, other.tag, t),
       timer: TextStyle.lerp(timer, other.timer, t),
       detail: TextStyle.lerp(detail, other.detail, t),
       tiny: TextStyle.lerp(tiny, other.tiny, t),
+      transactionDetailAmountPrimary: TextStyle.lerp(
+        transactionDetailAmountPrimary,
+        other.transactionDetailAmountPrimary,
+        t,
+      ),
+      transactionDetailAmountSymbol: TextStyle.lerp(
+        transactionDetailAmountSymbol,
+        other.transactionDetailAmountSymbol,
+        t,
+      ),
+      transactionDetailRowLabel: TextStyle.lerp(transactionDetailRowLabel, other.transactionDetailRowLabel, t),
+      transactionDetailRowValue: TextStyle.lerp(transactionDetailRowValue, other.transactionDetailRowValue, t),
+      sendSectionLabel: TextStyle.lerp(sendSectionLabel, other.sendSectionLabel, t),
+      conversionAmountPrimary: TextStyle.lerp(conversionAmountPrimary, other.conversionAmountPrimary, t),
     );
   }
 }
diff --git a/mobile-app/lib/v2/theme/app_theme.dart b/mobile-app/lib/v2/theme/app_theme.dart
index fd403b056..b8c7acd9d 100644
--- a/mobile-app/lib/v2/theme/app_theme.dart
+++ b/mobile-app/lib/v2/theme/app_theme.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/shared/extensions/media_query_data_extension.dart';
 
 import 'package:resonance_network_wallet/features/styles/app_colors_theme.dart' as v1_colors;
@@ -13,6 +14,7 @@ class AppTheme {
   static ThemeData darkTheme(BuildContext context) {
     final isTablet = context.isTablet;
     final colors = const AppColorsV2.dark();
+    final text = isTablet ? const AppTextTheme.iPad() : const AppTextTheme.defaultTheme();
 
     return ThemeData(
       scaffoldBackgroundColor: colors.background,
@@ -29,16 +31,24 @@ class AppTheme {
         style: OutlinedButton.styleFrom(shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14))),
       ),
       textButtonTheme: TextButtonThemeData(style: TextButton.styleFrom(foregroundColor: colors.textPrimary)),
+      textSelectionTheme: TextSelectionThemeData(
+        cursorColor: colors.accentOrange,
+        selectionColor: colors.accentOrange.useOpacity(0.2),
+        selectionHandleColor: colors.accentOrange,
+      ),
       inputDecorationTheme: InputDecorationTheme(
+        hintStyle: text.smallParagraph?.copyWith(color: colors.textLabel, fontFamily: AppTextTheme.fontFamilySecondary),
+        contentPadding: EdgeInsets.zero,
+        isDense: true,
         border: InputBorder.none,
         enabledBorder: InputBorder.none,
         focusedBorder: InputBorder.none,
         filled: true,
-        fillColor: colors.surface,
+        fillColor: Colors.transparent,
       ),
       extensions: [
         colors,
-        isTablet ? const AppTextTheme.iPad() : const AppTextTheme.defaultTheme(),
+        text,
         isTablet ? const AppSizeTheme.iPad() : const AppSizeTheme.defaultTheme(),
         // v1 compat: keeps existing screens working until migrated
         const v1_colors.AppColorsTheme.dark(),
diff --git a/mobile-app/lib/wallet_initializer.dart b/mobile-app/lib/wallet_initializer.dart
index d8f29bece..82b783d2f 100644
--- a/mobile-app/lib/wallet_initializer.dart
+++ b/mobile-app/lib/wallet_initializer.dart
@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:quantus_sdk/quantus_sdk.dart';
 import 'package:resonance_network_wallet/features/components/migration_dialog.dart';
 import 'package:resonance_network_wallet/v2/components/bottom_sheet_container.dart';
-import 'package:resonance_network_wallet/v2/components/glass_button.dart';
+import 'package:resonance_network_wallet/v2/components/quantus_button.dart';
 import 'package:resonance_network_wallet/v2/components/scaffold_base.dart';
 import 'package:resonance_network_wallet/v2/screens/home/home_screen.dart';
 import 'package:resonance_network_wallet/v2/screens/welcome/welcome_screen.dart';
@@ -98,7 +98,7 @@ class WalletInitializerState extends ConsumerState<WalletInitializer> {
           children: [
             Text('Unable to find secret phrase. Please restore your wallet.', style: ctx.themeText.smallParagraph),
             const SizedBox(height: 32),
-            GlassButton.simple(label: 'OK', onTap: () => Navigator.pop(ctx), variant: ButtonVariant.secondary),
+            QuantusButton.simple(label: 'OK', onTap: () => Navigator.pop(ctx), variant: ButtonVariant.secondary),
           ],
         ),
       ),
@@ -193,7 +193,7 @@ class WalletInitializerState extends ConsumerState<WalletInitializer> {
   @override
   Widget build(BuildContext context) {
     if (_loading) {
-      return const ScaffoldBase(child: Center(child: CircularProgressIndicator()));
+      return const ScaffoldBase(mainContent: Center(child: CircularProgressIndicator()));
     }
 
     if (_needsMigration) {
diff --git a/mobile-app/pubspec.lock b/mobile-app/pubspec.lock
index 940724f05..dfe7cb568 100644
--- a/mobile-app/pubspec.lock
+++ b/mobile-app/pubspec.lock
@@ -566,14 +566,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.2.1"
-  flutter_inset_shadow:
-    dependency: "direct main"
-    description:
-      name: flutter_inset_shadow
-      sha256: "5978b67f028c7ca3566516eda14f0a25a5ce13c0fa21a86a48a0b00faa7db9d7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
   flutter_launcher_icons:
     dependency: "direct main"
     description:
@@ -702,14 +694,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.0"
-  flutter_shaders:
-    dependency: transitive
-    description:
-      name: flutter_shaders
-      sha256: "34794acadd8275d971e02df03afee3dee0f98dbfb8c4837082ad0034f612a3e2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3"
   flutter_svg:
     dependency: "direct main"
     description:
@@ -760,14 +744,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.5.0"
-  glass_kit:
-    dependency: "direct main"
-    description:
-      name: glass_kit
-      sha256: ca071693b6b1c5ddc628aee030df0eb99a4063b55b5928cf84bb82f9bc32595f
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
   glob:
     dependency: transitive
     description:
@@ -868,8 +844,8 @@ packages:
     dependency: "direct main"
     description:
       path: dart
-      ref: "v2.0.1"
-      resolved-ref: "57ac13fd7f92afe8e89da30b94fc69fd68125f6f"
+      ref: "v2.2.0"
+      resolved-ref: cd1beb73c12e574dc6f6ac9a4cd6896d3603b62b
       url: "https://github.com/Quantus-Network/qp-human-checkphrase.git"
     source: git
     version: "0.1.0"
@@ -1041,14 +1017,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.0"
-  liquid_glass_renderer:
-    dependency: "direct main"
-    description:
-      name: liquid_glass_renderer
-      sha256: "789be157494b38cdef7607bb9b63e7fe3fab76fae16149e52fa313c2d858cb3f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.0-dev.4"
   local_auth:
     dependency: "direct main"
     description:
@@ -1153,14 +1121,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.4.6"
-  motor:
-    dependency: transitive
-    description:
-      name: motor
-      sha256: cbd49f21b00e568c2b1a55f134ed803614a107782f4fea7769693bca32940c58
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
   native_toolchain_c:
     dependency: transitive
     description:
diff --git a/mobile-app/pubspec.yaml b/mobile-app/pubspec.yaml
index 281ad9332..849ff8656 100644
--- a/mobile-app/pubspec.yaml
+++ b/mobile-app/pubspec.yaml
@@ -2,7 +2,7 @@ name: resonance_network_wallet
 description: A Flutter wallet for the Quantus blockchain.
 publish_to: "none"
 
-version: 1.3.5+100
+version: 1.4.0+101
 
 environment:
   sdk: ">=3.8.0 <4.0.0"
@@ -39,7 +39,7 @@ dependencies:
   human_checksum:
     git:
       url: https://github.com/Quantus-Network/qp-human-checkphrase.git
-      ref: v2.0.1
+      ref: v2.2.0
       path: dart
   provider: ^6.1.5
   polkadart: ^0.7.1
@@ -57,12 +57,9 @@ dependencies:
   timezone: ^0.10.1
   flutter_timezone: ^5.0.1
   collection: ^1.19.1
-  glass_kit: ^4.0.2
   firebase_core: ^4.4.0
   firebase_messaging: ^16.1.1
   image_picker: ^1.2.1
-  flutter_inset_shadow: ^2.0.3
-  liquid_glass_renderer: ^0.2.0-dev.4
 
 dev_dependencies:
   flutter_test:
@@ -105,20 +102,18 @@ flutter:
     - assets/v2/green_checkmark.png
     - assets/v2/pin_number_background.png
     - assets/v2/caret_left.svg
-    - assets/v2/send_button.png
-    - assets/v2/receive_button.png
-    - assets/v2/swap_button.png
-    - assets/v2/glass_circle_icon_button_bg.png
     - assets/v2/action_receive.svg
     - assets/v2/action_send.svg
     - assets/v2/action_swap.svg
     - assets/v2/uppercase_q.svg
+    - assets/v2/uppercase_q.png
+    - assets/v2/uppercase_q_black_bg.png
     - assets/v2/swap_arrows_down_up.svg
     - assets/v2/swap_clock_counter_clockwise.svg
     - assets/v2/swap_qr_code.svg
     - assets/v2/auth_wrapper_bracket.png
-    - assets/v2/gradient_background.png
-    - assets/v2/welcome_screen_bg_image.jpg
+    - assets/v2/splash_background.jpg
+    - assets/v2/ascii_background.png
     - assets/v2/quantus_orange_logo.png
 
 
@@ -147,16 +142,41 @@ flutter:
           weight: 600
         - asset: assets/fonts/Inter-Bold.ttf
           weight: 700
+    - family: Geist
+      fonts:
+        - asset: assets/fonts/Geist-Light.ttf
+          weight: 300
+        - asset: assets/fonts/Geist-Regular.ttf
+          weight: 400
+        - asset: assets/fonts/Geist-Medium.ttf
+          weight: 500
+        - asset: assets/fonts/Geist-SemiBold.ttf
+          weight: 600
+        - asset: assets/fonts/Geist-Bold.ttf
+          weight: 700
+    - family: Geist Mono
+      fonts:
+        - asset: assets/fonts/GeistMono-Light.ttf
+          weight: 300
+        - asset: assets/fonts/GeistMono-Regular.ttf
+          weight: 400
+        - asset: assets/fonts/GeistMono-Medium.ttf
+          weight: 500
+        - asset: assets/fonts/GeistMono-SemiBold.ttf
+          weight: 600
+        - asset: assets/fonts/GeistMono-Bold.ttf
+          weight: 700
 
 flutter_native_splash:
-  background_image: assets/v2/welcome_screen_bg_image.jpg
-  image: assets/v2/quantus_orange_logo.png
+  background_image: assets/v2/splash_background.jpg
+  color: "#0E0E0E"
+  image: assets/v2/uppercase_q.png
   android: true
   ios: true
 
   android_12:
     image: assets/v2/android12_icon_empty_1152.png
-    color: "#141414"
-    icon_background_color: "#141414"
-    branding: assets/v2/android12_branding_800x320.png
+    color: "#0E0E0E"
+    icon_background_color: "#0E0E0E"
+    branding: assets/v2/uppercase_q.png
     branding_bottom_padding: 88
diff --git a/mobile-app/test/unit/exchange_rate_service_test.dart b/mobile-app/test/unit/exchange_rate_service_test.dart
new file mode 100644
index 000000000..614e1bada
--- /dev/null
+++ b/mobile-app/test/unit/exchange_rate_service_test.dart
@@ -0,0 +1,132 @@
+import 'package:decimal/decimal.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:resonance_network_wallet/models/fiat_currency.dart';
+import 'package:resonance_network_wallet/services/exchange_rate_service.dart';
+
+void main() {
+  // 1 QUAN = 1 USD; 1 USD = 3.97 MYR, 17334 IDR (zero-decimal currency).
+  final rates = {'USD': Decimal.parse('1'), 'MYR': Decimal.parse('3.97'), 'IDR': Decimal.parse('17334')};
+
+  late ExchangeRateService service;
+
+  setUp(() {
+    service = ExchangeRateService(rates: rates);
+  });
+
+  group('ExchangeRateService.getRate', () {
+    test('returns the rate for a known currency', () {
+      expect(service.getRate(FiatCurrency.usd), Decimal.one);
+      expect(service.getRate(FiatCurrency.myr), Decimal.parse('3.97'));
+    });
+
+    test('falls back to fallbackRates for a missing live rate', () {
+      final serviceWithEmpty = ExchangeRateService(rates: {});
+      expect(serviceWithEmpty.getRate(FiatCurrency.usd), ExchangeRateService.fallbackRates['USD']);
+    });
+  });
+
+  group('ExchangeRateService.convert', () {
+    test('converts 1 QUAN to USD correctly (1 QUAN = 1 USD)', () {
+      expect(service.convert(Decimal.one, FiatCurrency.usd), Decimal.one);
+    });
+
+    test('converts 1 QUAN to MYR (1 QUAN = 4 MYR)', () {
+      expect(service.convert(Decimal.one, FiatCurrency.myr), Decimal.parse('3.97'));
+    });
+
+    test('converts 0.5 QUAN to MYR (0.5 × 3.97 = 1.99)', () {
+      expect(service.convert(Decimal.parse('0.5'), FiatCurrency.myr), Decimal.parse('1.99'));
+    });
+
+    test('applies quanToUsdRate when set', () {
+      final serviceWith2xRate = ExchangeRateService(rates: rates, quanToUsdRate: Decimal.parse('2'));
+      // 1 QUAN × 2 USD/QUAN × 3.97 MYR/USD = 7.94 MYR
+      expect(serviceWith2xRate.convert(Decimal.one, FiatCurrency.myr), Decimal.parse('7.94'));
+    });
+  });
+
+  group('ExchangeRateService.quanRawToFiat', () {
+    // 12 decimal places (AppConstants.decimals)
+    const quanDecimals = 12;
+    final oneQuan = BigInt.from(10).pow(quanDecimals); // 1.000000000000 QUAN
+
+    test('1 QUAN raw → 1.00 USD', () {
+      expect(service.quanRawToFiat(oneQuan, FiatCurrency.usd, quanDecimals), Decimal.one);
+    });
+
+    test('1 QUAN raw → 3.97 MYR', () {
+      expect(service.quanRawToFiat(oneQuan, FiatCurrency.myr, quanDecimals), Decimal.parse('3.97'));
+    });
+
+    test('0.5 QUAN raw → 1.99 MYR', () {
+      final halfQuan = BigInt.from(5) * BigInt.from(10).pow(quanDecimals - 1);
+      expect(service.quanRawToFiat(halfQuan, FiatCurrency.myr, quanDecimals), Decimal.parse('1.99'));
+    });
+
+    test('zero QUAN raw → zero fiat', () {
+      expect(service.quanRawToFiat(BigInt.zero, FiatCurrency.usd, quanDecimals), Decimal.zero);
+    });
+  });
+
+  group('ExchangeRateService.fiatToQuanRaw', () {
+    const quanDecimals = 12;
+    final oneQuan = BigInt.from(10).pow(quanDecimals);
+
+    test('1 USD → 1 QUAN raw', () {
+      expect(service.fiatToQuanRaw(Decimal.one, FiatCurrency.usd, quanDecimals), oneQuan);
+    });
+
+    test('3.97 MYR → 1 QUAN raw', () {
+      expect(service.fiatToQuanRaw(Decimal.parse('3.97'), FiatCurrency.myr, quanDecimals), oneQuan);
+    });
+
+    test('1.985 MYR → 0.5 QUAN raw', () {
+      final halfQuan = BigInt.from(5) * BigInt.from(10).pow(quanDecimals - 1);
+      expect(service.fiatToQuanRaw(Decimal.parse('1.985'), FiatCurrency.myr, quanDecimals), halfQuan);
+    });
+
+    test('zero fiat → zero QUAN raw', () {
+      expect(service.fiatToQuanRaw(Decimal.zero, FiatCurrency.usd, quanDecimals), BigInt.zero);
+    });
+
+    test('quanRawToFiat and fiatToQuanRaw are inverses for clean-divisor rates', () {
+      const quanDecimals = 12;
+      final original = BigInt.from(1_000_000_000_000); // 1.0 QUAN
+      final fiatValue = service.quanRawToFiat(original, FiatCurrency.myr, quanDecimals);
+      final roundTripped = service.fiatToQuanRaw(fiatValue, FiatCurrency.myr, quanDecimals);
+      expect(roundTripped, original);
+    });
+
+    test('round-trip is stable for non-clean-divisor rates (anchors to fiat precision)', () {
+      // 3.971 doesn't cleanly divide 1.5 QUAN's fiat value.
+      // By rounding the intermediate fiat value to fiat.decimals (2),
+      // we ensure that the round-tripped QUAN value is the canonical QUAN
+      // representation of that specific fiat amount.
+      const quanDecimals = 12;
+      final lossyService = ExchangeRateService(rates: {'MYR': Decimal.parse('3.971')});
+      final original = BigInt.from(1_500_000_000_000); // 1.5 QUAN
+
+      // 1.5 * 3.971 = 5.9565 -> rounded to 5.96 MYR
+      final fiatValue = lossyService.quanRawToFiat(original, FiatCurrency.myr, quanDecimals);
+      expect(fiatValue, Decimal.parse('5.96'));
+
+      final roundTripped = lossyService.fiatToQuanRaw(fiatValue, FiatCurrency.myr, quanDecimals);
+
+      // Subsequent round-trips from this fiatValue should be identical
+      final secondFiat = lossyService.quanRawToFiat(roundTripped, FiatCurrency.myr, quanDecimals);
+      final secondQUAN = lossyService.fiatToQuanRaw(secondFiat, FiatCurrency.myr, quanDecimals);
+
+      expect(secondFiat, fiatValue);
+      expect(secondQUAN, roundTripped);
+    });
+  });
+
+  group('FiatCurrency.decimals', () {
+    test('USD has 2 decimal places', () => expect(FiatCurrency.usd.decimals, 2));
+    test('EUR has 2 decimal places', () => expect(FiatCurrency.eur.decimals, 2));
+    test('GBP has 2 decimal places', () => expect(FiatCurrency.gbp.decimals, 2));
+    test('MYR has 2 decimal places', () => expect(FiatCurrency.myr.decimals, 2));
+    test('IDR has 0 decimal places', () => expect(FiatCurrency.idr.decimals, 0));
+    test('JPY has 0 decimal places', () => expect(FiatCurrency.jpy.decimals, 0));
+  });
+}
diff --git a/mobile-app/test/unit/locale_number_handling_test.dart b/mobile-app/test/unit/locale_number_handling_test.dart
new file mode 100644
index 000000000..17517af31
--- /dev/null
+++ b/mobile-app/test/unit/locale_number_handling_test.dart
@@ -0,0 +1,744 @@
+import 'package:decimal/decimal.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+
+void main() {
+  group('LocaleNumberConfig', () {
+    group('fromLocale factory', () {
+      test('US locale uses dot decimal and comma grouping', () {
+        final config = LocaleNumberConfig.fromLocale('en_US');
+        expect(config.decimalSeparator, '.');
+        expect(config.groupingSeparator, ',');
+        expect(config.isCommaDecimal, false);
+      });
+
+      test('Indonesian locale uses comma decimal and dot grouping', () {
+        final config = LocaleNumberConfig.fromLocale('id_ID');
+        expect(config.decimalSeparator, ',');
+        expect(config.groupingSeparator, '.');
+        expect(config.isCommaDecimal, true);
+      });
+
+      test('German locale uses comma decimal and dot grouping', () {
+        final config = LocaleNumberConfig.fromLocale('de_DE');
+        expect(config.decimalSeparator, ',');
+        expect(config.groupingSeparator, '.');
+        expect(config.isCommaDecimal, true);
+      });
+
+      test('French locale uses comma decimal', () {
+        final config = LocaleNumberConfig.fromLocale('fr_FR');
+        expect(config.decimalSeparator, ',');
+        expect(config.isCommaDecimal, true);
+      });
+
+      test('UK locale uses dot decimal and comma grouping', () {
+        final config = LocaleNumberConfig.fromLocale('en_GB');
+        expect(config.decimalSeparator, '.');
+        expect(config.groupingSeparator, ',');
+        expect(config.isCommaDecimal, false);
+      });
+
+      test('Japanese locale uses dot decimal', () {
+        final config = LocaleNumberConfig.fromLocale('ja_JP');
+        expect(config.decimalSeparator, '.');
+        expect(config.isCommaDecimal, false);
+      });
+
+      test('Malaysian locale uses dot decimal', () {
+        final config = LocaleNumberConfig.fromLocale('ms_MY');
+        expect(config.decimalSeparator, '.');
+        expect(config.isCommaDecimal, false);
+      });
+    });
+
+    group('normalize', () {
+      test('US locale: strips comma thousands, keeps dot decimal', () {
+        const config = LocaleNumberConfig.dotDecimal;
+        expect(config.normalize('1,000.50'), '1000.50');
+        expect(config.normalize('1,000,000.99'), '1000000.99');
+        expect(config.normalize('1,000'), '1000');
+        expect(config.normalize('0.5'), '0.5');
+        expect(config.normalize('100'), '100');
+      });
+
+      test('Indonesian locale: strips dot thousands, converts comma decimal', () {
+        const config = LocaleNumberConfig.commaDecimal;
+        expect(config.normalize('1.000,50'), '1000.50');
+        expect(config.normalize('1.000.000,99'), '1000000.99');
+        expect(config.normalize('1.000'), '1000');
+        expect(config.normalize('0,5'), '0.5');
+        expect(config.normalize('100'), '100');
+      });
+
+      test('empty string returns empty', () {
+        const config = LocaleNumberConfig.dotDecimal;
+        expect(config.normalize(''), '');
+      });
+
+      test('integer without separators is unchanged', () {
+        const config = LocaleNumberConfig.dotDecimal;
+        expect(config.normalize('12345'), '12345');
+
+        const configId = LocaleNumberConfig.commaDecimal;
+        expect(configId.normalize('12345'), '12345');
+      });
+
+      test('hand-rolled config with grouping == decimal does not strip the decimal', () {
+        // Defensive: if anyone constructs a config where grouping equals decimal
+        // (no real locale does this), normalize must not eat the decimal mark.
+        const config = LocaleNumberConfig(decimalSeparator: ',', groupingSeparator: ',', locale: 'broken');
+        expect(config.normalize('1,5'), '1.5');
+      });
+    });
+
+    group('parseDecimal', () {
+      test('US locale: parses thousands-grouped fiat input', () {
+        const config = LocaleNumberConfig.dotDecimal;
+        expect(config.parseDecimal('1,000'), Decimal.parse('1000'));
+        expect(config.parseDecimal('1,000.50'), Decimal.parse('1000.50'));
+        expect(config.parseDecimal('0.5'), Decimal.parse('0.5'));
+      });
+
+      test('Indonesian locale: parses thousands-grouped fiat input', () {
+        const config = LocaleNumberConfig.commaDecimal;
+        expect(config.parseDecimal('1.000'), Decimal.parse('1000'));
+        expect(config.parseDecimal('1.000,50'), Decimal.parse('1000.50'));
+        expect(config.parseDecimal('0,5'), Decimal.parse('0.5'));
+      });
+
+      test('throws InvalidNumberInputException on garbage input', () {
+        const config = LocaleNumberConfig.dotDecimal;
+        expect(() => config.parseDecimal('abc'), throwsA(isA<InvalidNumberInputException>()));
+        expect(() => config.parseDecimal('1.2.3'), throwsA(isA<InvalidNumberInputException>()));
+        expect(() => config.parseDecimal('.'), throwsA(isA<InvalidNumberInputException>()));
+        expect(() => config.parseDecimal(''), throwsA(isA<InvalidNumberInputException>()));
+      });
+
+      test('US locale: tolerates trailing decimal separator (mid-typing)', () {
+        const config = LocaleNumberConfig.dotDecimal;
+        expect(config.parseDecimal('1.'), Decimal.one);
+        expect(config.parseDecimal('100.'), Decimal.parse('100'));
+        expect(config.parseDecimal('1,000.'), Decimal.parse('1000'));
+      });
+
+      test('Indonesian locale: tolerates trailing decimal separator (mid-typing)', () {
+        const config = LocaleNumberConfig.commaDecimal;
+        expect(config.parseDecimal('1,'), Decimal.one);
+        expect(config.parseDecimal('100,'), Decimal.parse('100'));
+        expect(config.parseDecimal('1.000,'), Decimal.parse('1000'));
+      });
+
+      test('still throws on multiple decimal marks even with trailing separator', () {
+        const config = LocaleNumberConfig.dotDecimal;
+        expect(() => config.parseDecimal('1.2.'), throwsA(isA<InvalidNumberInputException>()));
+      });
+
+      test('exception carries raw and normalized strings', () {
+        const config = LocaleNumberConfig.commaDecimal;
+        try {
+          config.parseDecimal('1.2.3,nope');
+          fail('expected InvalidNumberInputException');
+        } on InvalidNumberInputException catch (e) {
+          expect(e.rawInput, '1.2.3,nope');
+          expect(e.normalized, '123.nope');
+        }
+      });
+    });
+
+    group('localize', () {
+      test('US locale: formats with dot decimal and comma grouping', () {
+        const config = LocaleNumberConfig.dotDecimal;
+        expect(config.localize('1000.50'), '1,000.50');
+        expect(config.localize('1000000.99'), '1,000,000.99');
+        expect(config.localize('0.5'), '0.5');
+        expect(config.localize('100'), '100');
+      });
+
+      test('Indonesian locale: formats with comma decimal and dot grouping', () {
+        const config = LocaleNumberConfig.commaDecimal;
+        expect(config.localize('1000.50'), '1.000,50');
+        expect(config.localize('1000000.99'), '1.000.000,99');
+        expect(config.localize('0.5'), '0,5');
+        expect(config.localize('100'), '100');
+      });
+
+      test('without grouping separators', () {
+        const config = LocaleNumberConfig.dotDecimal;
+        expect(config.localize('1000.50', addGroupingSeparators: false), '1000.50');
+
+        const configId = LocaleNumberConfig.commaDecimal;
+        expect(configId.localize('1000.50', addGroupingSeparators: false), '1000,50');
+      });
+    });
+
+    group('roundtrip: normalize then localize', () {
+      test('US locale roundtrip', () {
+        const config = LocaleNumberConfig.dotDecimal;
+        final localized = '1,000.50';
+        final normalized = config.normalize(localized);
+        expect(normalized, '1000.50');
+        expect(config.localize(normalized), localized);
+      });
+
+      test('Indonesian locale roundtrip', () {
+        const config = LocaleNumberConfig.commaDecimal;
+        final localized = '1.000,50';
+        final normalized = config.normalize(localized);
+        expect(normalized, '1000.50');
+        expect(config.localize(normalized), localized);
+      });
+    });
+  });
+
+  group('DecimalInputFilter (locale-aware)', () {
+    /// Simulates typing: one character at a time (newText is 1 char longer).
+    TextEditingValue typeChar(DecimalInputFilter filter, String currentText, String charToType) {
+      final oldValue = TextEditingValue(
+        text: currentText,
+        selection: TextSelection.collapsed(offset: currentText.length),
+      );
+      final newText = currentText + charToType;
+      final newValue = TextEditingValue(
+        text: newText,
+        selection: TextSelection.collapsed(offset: newText.length),
+      );
+      return filter.formatEditUpdate(oldValue, newValue);
+    }
+
+    /// Simulates pasting: multiple characters change at once.
+    TextEditingValue paste(DecimalInputFilter filter, String currentText, String pastedText) {
+      final oldValue = TextEditingValue(
+        text: currentText,
+        selection: TextSelection.collapsed(offset: currentText.length),
+      );
+      final newValue = TextEditingValue(
+        text: pastedText,
+        selection: TextSelection.collapsed(offset: pastedText.length),
+      );
+      return filter.formatEditUpdate(oldValue, newValue);
+    }
+
+    group('US locale (dot decimal) - typing', () {
+      late DecimalInputFilter filter;
+
+      setUp(() {
+        filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.dotDecimal);
+      });
+
+      test('allows empty input', () {
+        final result = filter.formatEditUpdate(
+          const TextEditingValue(text: '1', selection: TextSelection.collapsed(offset: 1)),
+          const TextEditingValue(text: '', selection: TextSelection.collapsed(offset: 0)),
+        );
+        expect(result.text, '');
+      });
+
+      test('allows integer input', () {
+        final result = typeChar(filter, '12', '3');
+        expect(result.text, '123');
+      });
+
+      test('allows dot as decimal separator', () {
+        final result = typeChar(filter, '1', '.');
+        expect(result.text, '1.');
+      });
+
+      test('also accepts comma as decimal (converts to dot for US)', () {
+        final result = typeChar(filter, '1', ',');
+        expect(result.text, '1.');
+      });
+
+      test('lone dot becomes 0.', () {
+        final result = typeChar(filter, '', '.');
+        expect(result.text, '0.');
+      });
+
+      test('lone comma also becomes 0. (converted to locale decimal)', () {
+        final result = typeChar(filter, '', ',');
+        expect(result.text, '0.');
+      });
+
+      test('rejects second decimal separator', () {
+        final result = typeChar(filter, '1.2', '.');
+        expect(result.text, '1.2');
+      });
+
+      test('rejects leading zeros', () {
+        final result = typeChar(filter, '0', '1');
+        expect(result.text, '0');
+      });
+
+      test('allows 0 followed by decimal', () {
+        final result = typeChar(filter, '0', '.');
+        expect(result.text, '0.');
+      });
+
+      test('respects maxDecimalPlaces', () {
+        final filter2dp = DecimalInputFilter(localeConfig: LocaleNumberConfig.dotDecimal, maxDecimalPlaces: 2);
+        expect(typeChar(filter2dp, '1.2', '3').text, '1.23');
+        expect(typeChar(filter2dp, '1.23', '4').text, '1.23');
+      });
+
+      test('blocks decimal when maxDecimalPlaces is 0', () {
+        final filter0dp = DecimalInputFilter(localeConfig: LocaleNumberConfig.dotDecimal, maxDecimalPlaces: 0);
+        expect(typeChar(filter0dp, '1', '.').text, '1');
+        expect(typeChar(filter0dp, '', '.').text, '');
+        expect(typeChar(filter0dp, '12', '3').text, '123');
+      });
+    });
+
+    group('Indonesian locale (comma decimal) - typing', () {
+      late DecimalInputFilter filter;
+
+      setUp(() {
+        filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal);
+      });
+
+      test('allows comma as decimal separator', () {
+        final result = typeChar(filter, '1', ',');
+        expect(result.text, '1,');
+      });
+
+      test('also accepts dot as decimal (converts to comma for Indonesian)', () {
+        final result = typeChar(filter, '1', '.');
+        expect(result.text, '1,');
+      });
+
+      test('lone comma becomes 0,', () {
+        final result = typeChar(filter, '', ',');
+        expect(result.text, '0,');
+      });
+
+      test('lone dot also becomes 0, (converted to locale decimal)', () {
+        final result = typeChar(filter, '', '.');
+        expect(result.text, '0,');
+      });
+
+      test('typing digits after comma works', () {
+        var result = typeChar(filter, '1,', '5');
+        expect(result.text, '1,5');
+      });
+
+      test('rejects second decimal separator', () {
+        final result = typeChar(filter, '1,2', ',');
+        expect(result.text, '1,2');
+      });
+
+      test('rejects dot when comma already present (already has decimal)', () {
+        final result = typeChar(filter, '1,2', '.');
+        expect(result.text, '1,2');
+      });
+
+      test('respects maxDecimalPlaces', () {
+        final filter2dp = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal, maxDecimalPlaces: 2);
+        expect(typeChar(filter2dp, '1,2', '3').text, '1,23');
+        expect(typeChar(filter2dp, '1,23', '4').text, '1,23');
+      });
+
+      test('blocks decimal when maxDecimalPlaces is 0 (IDR)', () {
+        final filter0dp = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal, maxDecimalPlaces: 0);
+        expect(typeChar(filter0dp, '1', ',').text, '1');
+        expect(typeChar(filter0dp, '1', '.').text, '1');
+        expect(typeChar(filter0dp, '', ',').text, '');
+        expect(typeChar(filter0dp, '12', '3').text, '123');
+      });
+    });
+
+    group('US locale - paste', () {
+      late DecimalInputFilter filter;
+
+      setUp(() {
+        filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.dotDecimal);
+      });
+
+      test('strips comma thousands on paste', () {
+        final result = paste(filter, '', '1,000');
+        expect(result.text, '1000');
+      });
+
+      test('keeps dot decimal and strips comma thousands', () {
+        final result = paste(filter, '', '1,000.50');
+        expect(result.text, '1000.50');
+      });
+
+      test('handles large pasted number', () {
+        final result = paste(filter, '', '1,234,567.89');
+        expect(result.text, '1234567.89');
+      });
+
+      test('plain number paste works', () {
+        final result = paste(filter, '', '12345');
+        expect(result.text, '12345');
+      });
+    });
+
+    group('Indonesian locale - paste', () {
+      late DecimalInputFilter filter;
+
+      setUp(() {
+        filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal);
+      });
+
+      test('strips dot thousands on paste (1.000 → 1000)', () {
+        final result = paste(filter, '', '1.000');
+        expect(result.text, '1000');
+      });
+
+      test('handles full Indonesian format paste (1.000,50)', () {
+        final result = paste(filter, '', '1.000,50');
+        expect(result.text, '1000,50');
+      });
+
+      test('strips dot thousands from large number', () {
+        final result = paste(filter, '', '10.000.000');
+        expect(result.text, '10000000');
+      });
+
+      test('plain number paste works', () {
+        final result = paste(filter, '', '12345');
+        expect(result.text, '12345');
+      });
+
+      test('paste with only comma decimal', () {
+        final result = paste(filter, '', '100,5');
+        expect(result.text, '100,5');
+      });
+    });
+
+    group('cross-locale scenarios', () {
+      test('Indonesian user types dot on keyboard → converted to comma (decimal)', () {
+        final idFilter = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal);
+        final result = typeChar(idFilter, '100', '.');
+        expect(result.text, '100,');
+      });
+
+      test('US user types comma on keyboard → converted to dot (decimal)', () {
+        final usFilter = DecimalInputFilter(localeConfig: LocaleNumberConfig.dotDecimal);
+        final result = typeChar(usFilter, '100', ',');
+        expect(result.text, '100.');
+      });
+
+      test('Indonesian user pastes US-formatted 1.500 → dot stripped as thousands → 1500', () {
+        final idFilter = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal);
+        final result = paste(idFilter, '', '1.500');
+        expect(result.text, '1500');
+      });
+
+      test('US user pastes 1.000 → kept as 1.000 (decimal)', () {
+        // In US locale during paste: comma is grouping and stripped.
+        // Dot is decimal and kept. "1.000" = one with 3 decimal places.
+        final usFilter = DecimalInputFilter(localeConfig: LocaleNumberConfig.dotDecimal);
+        final result = paste(usFilter, '', '1.000');
+        expect(result.text, '1.000');
+      });
+
+      test('Indonesian user pastes 1,500 from US → comma is decimal → 1,500 (one and a half)', () {
+        final idFilter = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal);
+        final result = paste(idFilter, '', '1,500');
+        expect(result.text, '1,500');
+      });
+    });
+  });
+
+  group('NumberFormattingService (locale-aware)', () {
+    final usService = NumberFormattingService(localeConfig: LocaleNumberConfig.dotDecimal);
+    final idService = NumberFormattingService(localeConfig: LocaleNumberConfig.commaDecimal);
+    final scaleFactor = BigInt.from(10).pow(NumberFormattingService.decimals);
+
+    group('formatBalance with locale', () {
+      test('US locale: formats with dot decimal and comma thousands', () {
+        final balance = BigInt.parse('1234500000000000'); // 1234.5
+        expect(usService.formatBalance(balance, maxDecimals: 2), '1,234.5');
+      });
+
+      test('Indonesian locale: formats with comma decimal and dot thousands', () {
+        final balance = BigInt.parse('1234500000000000'); // 1234.5
+        expect(idService.formatBalance(balance, maxDecimals: 2), '1.234,5');
+      });
+
+      test('US locale: no thousands separators', () {
+        final balance = BigInt.parse('1234500000000000');
+        expect(usService.formatBalance(balance, maxDecimals: 4, addThousandsSeparators: false), '1234.5');
+      });
+
+      test('Indonesian locale: no thousands separators', () {
+        final balance = BigInt.parse('1234500000000000');
+        expect(idService.formatBalance(balance, maxDecimals: 4, addThousandsSeparators: false), '1234,5');
+      });
+
+      test('zero balance is always 0', () {
+        expect(idService.formatBalance(BigInt.zero), '0');
+      });
+
+      test('Indonesian locale: large balance', () {
+        final balance = BigInt.parse('1234567890123000000000'); // 1,234,567,890.123
+        expect(idService.formatBalance(balance, maxDecimals: 3), '1.234.567.890,123');
+      });
+    });
+
+    group('parseAmount with locale', () {
+      test('US locale: parses dot decimal', () {
+        expect(usService.parseAmount('1.5'), scaleFactor * BigInt.from(15) ~/ BigInt.from(10));
+      });
+
+      test('US locale: strips comma thousands before parsing', () {
+        expect(usService.parseAmount('1,000.5'), BigInt.parse('1000500000000000'));
+      });
+
+      test('Indonesian locale: parses comma decimal', () {
+        expect(idService.parseAmount('1,5'), scaleFactor * BigInt.from(15) ~/ BigInt.from(10));
+      });
+
+      test('Indonesian locale: strips dot thousands before parsing', () {
+        expect(idService.parseAmount('1.000,5'), BigInt.parse('1000500000000000'));
+      });
+
+      test('Indonesian locale: 1.000 means 1000 (not 1.000)', () {
+        expect(idService.parseAmount('1.000'), scaleFactor * BigInt.from(1000));
+      });
+
+      test('US locale: 1.000 means 1.000 (one with three decimal places)', () {
+        expect(usService.parseAmount('1.000'), scaleFactor * BigInt.one);
+      });
+
+      test('empty string returns zero', () {
+        expect(idService.parseAmount(''), BigInt.zero);
+      });
+
+      test('invalid string returns null', () {
+        expect(usService.parseAmount('abc'), isNull);
+      });
+
+      test('Indonesian locale: integer without separators', () {
+        expect(idService.parseAmount('1500'), scaleFactor * BigInt.from(1500));
+      });
+    });
+
+    group('parseAmount + formatBalance roundtrip', () {
+      test('US locale roundtrip', () {
+        final parsed = usService.parseAmount('1,234.56');
+        expect(parsed, isNotNull);
+        final formatted = usService.formatBalance(parsed!, maxDecimals: 2);
+        expect(formatted, '1,234.56');
+      });
+
+      test('Indonesian locale roundtrip', () {
+        final parsed = idService.parseAmount('1.234,56');
+        expect(parsed, isNotNull);
+        final formatted = idService.formatBalance(parsed!, maxDecimals: 2);
+        expect(formatted, '1.234,56');
+      });
+    });
+  });
+
+  group('Real-world scenarios', () {
+    final usService = NumberFormattingService(localeConfig: LocaleNumberConfig.dotDecimal);
+    final idService = NumberFormattingService(localeConfig: LocaleNumberConfig.commaDecimal);
+    final scaleFactor = BigInt.from(10).pow(NumberFormattingService.decimals);
+
+    test('Indonesian user inputs 1.000 intending Rp 1000 (not 1.000 QUAN)', () {
+      final parsed = idService.parseAmount('1.000');
+      expect(parsed, scaleFactor * BigInt.from(1000));
+    });
+
+    test('US user inputs 1.000 intending 1 QUAN with trailing zeros', () {
+      final parsed = usService.parseAmount('1.000');
+      expect(parsed, scaleFactor * BigInt.one);
+    });
+
+    test('Indonesian user inputs 0,5 intending half a unit', () {
+      final parsed = idService.parseAmount('0,5');
+      expect(parsed, scaleFactor ~/ BigInt.two);
+    });
+
+    test('US user inputs 0.5 intending half a unit', () {
+      final parsed = usService.parseAmount('0.5');
+      expect(parsed, scaleFactor ~/ BigInt.two);
+    });
+
+    test('Indonesian user copies 10.500,75 from a local source', () {
+      final parsed = idService.parseAmount('10.500,75');
+      final expected = (scaleFactor * BigInt.from(1050075)) ~/ BigInt.from(100);
+      expect(parsed, expected);
+    });
+
+    test('US user copies 10,500.75 from a local source', () {
+      final parsed = usService.parseAmount('10,500.75');
+      final expected = (scaleFactor * BigInt.from(1050075)) ~/ BigInt.from(100);
+      expect(parsed, expected);
+    });
+
+    test('Indonesian user types dot on iOS keyboard → gets comma in text field', () {
+      final filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal);
+      // Simulates typing "1" then "." on keyboard
+      final result = filter.formatEditUpdate(
+        const TextEditingValue(text: '1', selection: TextSelection.collapsed(offset: 1)),
+        const TextEditingValue(text: '1.', selection: TextSelection.collapsed(offset: 2)),
+      );
+      // Should convert to comma (locale's decimal separator)
+      expect(result.text, '1,');
+    });
+
+    test('US user types comma on some keyboards → gets dot in text field', () {
+      final filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.dotDecimal);
+      final result = filter.formatEditUpdate(
+        const TextEditingValue(text: '1', selection: TextSelection.collapsed(offset: 1)),
+        const TextEditingValue(text: '1,', selection: TextSelection.collapsed(offset: 2)),
+      );
+      expect(result.text, '1.');
+    });
+
+    test('DecimalInputFilter blocks IDR decimal input (0 decimal places)', () {
+      final filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal, maxDecimalPlaces: 0);
+      final oldValue = const TextEditingValue(text: '1000', selection: TextSelection.collapsed(offset: 4));
+      // Try comma
+      var newValue = const TextEditingValue(text: '1000,', selection: TextSelection.collapsed(offset: 5));
+      expect(filter.formatEditUpdate(oldValue, newValue).text, '1000');
+      // Try dot
+      newValue = const TextEditingValue(text: '1000.', selection: TextSelection.collapsed(offset: 5));
+      expect(filter.formatEditUpdate(oldValue, newValue).text, '1000');
+    });
+
+    test('DecimalInputFilter blocks JPY decimal input (0 decimal places, dot locale)', () {
+      final filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.dotDecimal, maxDecimalPlaces: 0);
+      final oldValue = const TextEditingValue(text: '1000', selection: TextSelection.collapsed(offset: 4));
+      var newValue = const TextEditingValue(text: '1000.', selection: TextSelection.collapsed(offset: 5));
+      expect(filter.formatEditUpdate(oldValue, newValue).text, '1000');
+      newValue = const TextEditingValue(text: '1000,', selection: TextSelection.collapsed(offset: 5));
+      expect(filter.formatEditUpdate(oldValue, newValue).text, '1000');
+    });
+
+    test('USD allows 2 decimal places', () {
+      final filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.dotDecimal, maxDecimalPlaces: 2);
+      final result = filter.formatEditUpdate(
+        const TextEditingValue(text: '10.9', selection: TextSelection.collapsed(offset: 4)),
+        const TextEditingValue(text: '10.99', selection: TextSelection.collapsed(offset: 5)),
+      );
+      expect(result.text, '10.99');
+
+      final result2 = filter.formatEditUpdate(
+        const TextEditingValue(text: '10.99', selection: TextSelection.collapsed(offset: 5)),
+        const TextEditingValue(text: '10.999', selection: TextSelection.collapsed(offset: 6)),
+      );
+      expect(result2.text, '10.99');
+    });
+
+    test('EUR with comma decimal allows 2 decimal places', () {
+      final filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal, maxDecimalPlaces: 2);
+      final result = filter.formatEditUpdate(
+        const TextEditingValue(text: '10,9', selection: TextSelection.collapsed(offset: 4)),
+        const TextEditingValue(text: '10,99', selection: TextSelection.collapsed(offset: 5)),
+      );
+      expect(result.text, '10,99');
+
+      final result2 = filter.formatEditUpdate(
+        const TextEditingValue(text: '10,99', selection: TextSelection.collapsed(offset: 5)),
+        const TextEditingValue(text: '10,999', selection: TextSelection.collapsed(offset: 6)),
+      );
+      expect(result2.text, '10,99');
+    });
+
+    test('Full typing flow: Indonesian user types 1500,75', () {
+      final filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal);
+      // Type 1
+      var result = filter.formatEditUpdate(
+        const TextEditingValue(text: '', selection: TextSelection.collapsed(offset: 0)),
+        const TextEditingValue(text: '1', selection: TextSelection.collapsed(offset: 1)),
+      );
+      expect(result.text, '1');
+      // Type 5
+      result = filter.formatEditUpdate(
+        TextEditingValue(
+          text: result.text,
+          selection: TextSelection.collapsed(offset: result.text.length),
+        ),
+        const TextEditingValue(text: '15', selection: TextSelection.collapsed(offset: 2)),
+      );
+      expect(result.text, '15');
+      // Type 0
+      result = filter.formatEditUpdate(
+        TextEditingValue(
+          text: result.text,
+          selection: TextSelection.collapsed(offset: result.text.length),
+        ),
+        const TextEditingValue(text: '150', selection: TextSelection.collapsed(offset: 3)),
+      );
+      expect(result.text, '150');
+      // Type 0
+      result = filter.formatEditUpdate(
+        TextEditingValue(
+          text: result.text,
+          selection: TextSelection.collapsed(offset: result.text.length),
+        ),
+        const TextEditingValue(text: '1500', selection: TextSelection.collapsed(offset: 4)),
+      );
+      expect(result.text, '1500');
+      // Type , (decimal)
+      result = filter.formatEditUpdate(
+        TextEditingValue(
+          text: result.text,
+          selection: TextSelection.collapsed(offset: result.text.length),
+        ),
+        const TextEditingValue(text: '1500,', selection: TextSelection.collapsed(offset: 5)),
+      );
+      expect(result.text, '1500,');
+      // Type 7
+      result = filter.formatEditUpdate(
+        TextEditingValue(
+          text: result.text,
+          selection: TextSelection.collapsed(offset: result.text.length),
+        ),
+        const TextEditingValue(text: '1500,7', selection: TextSelection.collapsed(offset: 6)),
+      );
+      expect(result.text, '1500,7');
+      // Type 5
+      result = filter.formatEditUpdate(
+        TextEditingValue(
+          text: result.text,
+          selection: TextSelection.collapsed(offset: result.text.length),
+        ),
+        const TextEditingValue(text: '1500,75', selection: TextSelection.collapsed(offset: 7)),
+      );
+      expect(result.text, '1500,75');
+    });
+
+    test('Full typing flow: Indonesian user types with dot keyboard (iOS)', () {
+      final filter = DecimalInputFilter(localeConfig: LocaleNumberConfig.commaDecimal);
+      // Type 1
+      var result = filter.formatEditUpdate(
+        const TextEditingValue(text: '', selection: TextSelection.collapsed(offset: 0)),
+        const TextEditingValue(text: '1', selection: TextSelection.collapsed(offset: 1)),
+      );
+      expect(result.text, '1');
+      // Type 5
+      result = filter.formatEditUpdate(
+        TextEditingValue(
+          text: result.text,
+          selection: TextSelection.collapsed(offset: result.text.length),
+        ),
+        const TextEditingValue(text: '15', selection: TextSelection.collapsed(offset: 2)),
+      );
+      expect(result.text, '15');
+      // Type . on iOS keyboard (should become ,)
+      result = filter.formatEditUpdate(
+        TextEditingValue(
+          text: result.text,
+          selection: TextSelection.collapsed(offset: result.text.length),
+        ),
+        const TextEditingValue(text: '15.', selection: TextSelection.collapsed(offset: 3)),
+      );
+      expect(result.text, '15,');
+      // Type 5
+      result = filter.formatEditUpdate(
+        TextEditingValue(
+          text: result.text,
+          selection: TextSelection.collapsed(offset: result.text.length),
+        ),
+        const TextEditingValue(text: '15,5', selection: TextSelection.collapsed(offset: 4)),
+      );
+      expect(result.text, '15,5');
+    });
+  });
+}
diff --git a/mobile-app/test/unit/number_formatting_service_test.dart b/mobile-app/test/unit/number_formatting_service_test.dart
index 5cc3b3a54..5de0f8b4c 100644
--- a/mobile-app/test/unit/number_formatting_service_test.dart
+++ b/mobile-app/test/unit/number_formatting_service_test.dart
@@ -3,7 +3,7 @@ import 'package:quantus_sdk/quantus_sdk.dart';
 
 void main() {
   group('NumberFormattingService', () {
-    final service = NumberFormattingService();
+    final service = NumberFormattingService(localeConfig: LocaleNumberConfig.dotDecimal);
     final scaleFactor = BigInt.from(10).pow(NumberFormattingService.decimals);
 
     group('formatBalance', () {
diff --git a/mobile-app/test/unit/send_screen_logic_test.dart b/mobile-app/test/unit/send_screen_logic_test.dart
index ac5e84f71..b4eb35062 100644
--- a/mobile-app/test/unit/send_screen_logic_test.dart
+++ b/mobile-app/test/unit/send_screen_logic_test.dart
@@ -8,7 +8,7 @@ void main() {
     late NumberFormattingService formattingService;
 
     setUp(() {
-      formattingService = NumberFormattingService();
+      formattingService = NumberFormattingService(localeConfig: LocaleNumberConfig.dotDecimal);
     });
 
     group('getAmountStatus', () {
@@ -174,7 +174,7 @@ void main() {
         expect(result, equals('Below Existential Deposit'));
       });
 
-      test('returns formatted send amount for valid status', () {
+      test('returns Review Send for valid status', () {
         final result = SendScreenLogic.getButtonText(
           hasAddressError: false,
           amountStatus: AmountStatus.valid,
@@ -183,7 +183,7 @@ void main() {
           activeAccountId: 'sender_address',
           formattingService: formattingService,
         );
-        expect(result, startsWith('Send'));
+        expect(result, equals('Review Send'));
       });
     });
 
diff --git a/mobile-app/test/unit/wallet_creation_service_test.dart b/mobile-app/test/unit/wallet_creation_service_test.dart
new file mode 100644
index 000000000..e7e84c3c7
--- /dev/null
+++ b/mobile-app/test/unit/wallet_creation_service_test.dart
@@ -0,0 +1,71 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:resonance_network_wallet/services/referral_service.dart';
+import 'package:resonance_network_wallet/services/wallet_creation_service.dart';
+
+@GenerateNiceMocks([MockSpec<SettingsService>(), MockSpec<AccountsService>(), MockSpec<ReferralService>()])
+import 'wallet_creation_service_test.mocks.dart';
+
+void main() {
+  group('WalletCreationService.createNewWallet', () {
+    test('persists mnemonic, adds root account, and submits referral when no root exists', () async {
+      final settings = MockSettingsService();
+      final accounts = MockAccountsService();
+      final referral = MockReferralService();
+
+      final service = WalletCreationService(
+        settingsService: settings,
+        accountsService: accounts,
+        referralService: referral,
+      );
+
+      const mnemonic = 'abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about';
+      const accountId = 'abc';
+      const name = 'Account 1';
+
+      final created = await service.createNewWallet(
+        name: name,
+        mnemonic: mnemonic,
+        walletIndex: 0,
+        accountId: accountId,
+        existingAccounts: const [],
+      );
+
+      verify(settings.setMnemonic(mnemonic, 0)).called(1);
+      verify(accounts.addAccount(argThat(isA<Account>().having((a) => a.accountId, 'accountId', 'abc')))).called(1);
+      verify(referral.submitAddressToBackend()).called(1);
+
+      expect(created.accountId, accountId);
+      expect(created.name, name);
+    });
+
+    test('skips add and referral when root account already exists', () async {
+      final settings = MockSettingsService();
+      final accounts = MockAccountsService();
+      final referral = MockReferralService();
+
+      final service = WalletCreationService(
+        settingsService: settings,
+        accountsService: accounts,
+        referralService: referral,
+      );
+
+      const existing = Account(walletIndex: 0, index: 0, name: 'Existing', accountId: 'existing_addr');
+
+      final created = await service.createNewWallet(
+        name: 'Account 1',
+        mnemonic: 'word ' * 12,
+        walletIndex: 0,
+        accountId: 'new_derived_addr',
+        existingAccounts: const [existing],
+      );
+
+      verify(settings.setMnemonic('word ' * 12, 0)).called(1);
+      verifyNever(accounts.addAccount(any));
+      verifyNever(referral.submitAddressToBackend());
+      expect(created, same(existing));
+    });
+  });
+}
diff --git a/mobile-app/test/unit/wallet_creation_service_test.mocks.dart b/mobile-app/test/unit/wallet_creation_service_test.mocks.dart
new file mode 100644
index 000000000..86535cfca
--- /dev/null
+++ b/mobile-app/test/unit/wallet_creation_service_test.mocks.dart
@@ -0,0 +1,656 @@
+// Mocks generated by Mockito 5.4.6 from annotations
+// in resonance_network_wallet/test/unit/wallet_creation_service_test.dart.
+// Do not manually edit this file.
+
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'dart:async' as _i5;
+import 'dart:ui' as _i9;
+
+import 'package:mockito/mockito.dart' as _i1;
+import 'package:mockito/src/dummies.dart' as _i7;
+import 'package:quantus_sdk/quantus_sdk.dart' as _i4;
+import 'package:quantus_sdk/src/models/account.dart' as _i2;
+import 'package:quantus_sdk/src/models/display_account.dart' as _i6;
+import 'package:resonance_network_wallet/services/referral_service.dart' as _i8;
+import 'package:share_plus/share_plus.dart' as _i3;
+
+// ignore_for_file: type=lint
+// ignore_for_file: avoid_redundant_argument_values
+// ignore_for_file: avoid_setters_without_getters
+// ignore_for_file: comment_references
+// ignore_for_file: deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
+// ignore_for_file: implementation_imports
+// ignore_for_file: invalid_use_of_visible_for_testing_member
+// ignore_for_file: must_be_immutable
+// ignore_for_file: prefer_const_constructors
+// ignore_for_file: unnecessary_parenthesis
+// ignore_for_file: camel_case_types
+// ignore_for_file: subtype_of_sealed_class
+
+class _FakeAccount_0 extends _i1.SmartFake implements _i2.Account {
+  _FakeAccount_0(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+class _FakeShareParams_1 extends _i1.SmartFake implements _i3.ShareParams {
+  _FakeShareParams_1(Object parent, Invocation parentInvocation) : super(parent, parentInvocation);
+}
+
+/// A class which mocks [SettingsService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockSettingsService extends _i1.Mock implements _i4.SettingsService {
+  @override
+  _i5.Future<void> initialize() =>
+      (super.noSuchMethod(
+            Invocation.method(#initialize, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<List<_i2.Account>> getAccounts() =>
+      (super.noSuchMethod(
+            Invocation.method(#getAccounts, []),
+            returnValue: _i5.Future<List<_i2.Account>>.value(<_i2.Account>[]),
+            returnValueForMissingStub: _i5.Future<List<_i2.Account>>.value(<_i2.Account>[]),
+          )
+          as _i5.Future<List<_i2.Account>>);
+
+  @override
+  _i5.Future<void> saveAccounts(List<_i2.Account>? accounts) =>
+      (super.noSuchMethod(
+            Invocation.method(#saveAccounts, [accounts]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> setAccountsToMigrate(List<_i2.Account>? accounts) =>
+      (super.noSuchMethod(
+            Invocation.method(#setAccountsToMigrate, [accounts]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  List<_i2.Account> getAccountsToMigrate() =>
+      (super.noSuchMethod(
+            Invocation.method(#getAccountsToMigrate, []),
+            returnValue: <_i2.Account>[],
+            returnValueForMissingStub: <_i2.Account>[],
+          )
+          as List<_i2.Account>);
+
+  @override
+  _i5.Future<void> clearAccountsToMigrate() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAccountsToMigrate, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> addAccount(_i2.Account? account) =>
+      (super.noSuchMethod(
+            Invocation.method(#addAccount, [account]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> updateAccount(_i2.Account? account) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateAccount, [account]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> removeAccount(_i2.Account? account) =>
+      (super.noSuchMethod(
+            Invocation.method(#removeAccount, [account]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> setActiveAccount(_i6.DisplayAccount? account) =>
+      (super.noSuchMethod(
+            Invocation.method(#setActiveAccount, [account]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<_i6.DisplayAccount?> getActiveAccount() =>
+      (super.noSuchMethod(
+            Invocation.method(#getActiveAccount, []),
+            returnValue: _i5.Future<_i6.DisplayAccount?>.value(),
+            returnValueForMissingStub: _i5.Future<_i6.DisplayAccount?>.value(),
+          )
+          as _i5.Future<_i6.DisplayAccount?>);
+
+  @override
+  _i5.Future<_i2.Account?> getActiveRegularAccount() =>
+      (super.noSuchMethod(
+            Invocation.method(#getActiveRegularAccount, []),
+            returnValue: _i5.Future<_i2.Account?>.value(),
+            returnValueForMissingStub: _i5.Future<_i2.Account?>.value(),
+          )
+          as _i5.Future<_i2.Account?>);
+
+  @override
+  _i5.Future<_i2.Account?> getAccount({required int? walletIndex, required int? index}) =>
+      (super.noSuchMethod(
+            Invocation.method(#getAccount, [], {#walletIndex: walletIndex, #index: index}),
+            returnValue: _i5.Future<_i2.Account?>.value(),
+            returnValueForMissingStub: _i5.Future<_i2.Account?>.value(),
+          )
+          as _i5.Future<_i2.Account?>);
+
+  @override
+  _i5.Future<int> getNextFreeAccountIndex(int? walletIndex) =>
+      (super.noSuchMethod(
+            Invocation.method(#getNextFreeAccountIndex, [walletIndex]),
+            returnValue: _i5.Future<int>.value(0),
+            returnValueForMissingStub: _i5.Future<int>.value(0),
+          )
+          as _i5.Future<int>);
+
+  @override
+  _i5.Future<Map<String, String>> getAddressBook() =>
+      (super.noSuchMethod(
+            Invocation.method(#getAddressBook, []),
+            returnValue: _i5.Future<Map<String, String>>.value(<String, String>{}),
+            returnValueForMissingStub: _i5.Future<Map<String, String>>.value(<String, String>{}),
+          )
+          as _i5.Future<Map<String, String>>);
+
+  @override
+  _i5.Future<void> saveAddressBook(Map<String, String>? addressBook) =>
+      (super.noSuchMethod(
+            Invocation.method(#saveAddressBook, [addressBook]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> setAddressName(String? address, String? name) =>
+      (super.noSuchMethod(
+            Invocation.method(#setAddressName, [address, name]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<String?> getAddressName(String? address) =>
+      (super.noSuchMethod(
+            Invocation.method(#getAddressName, [address]),
+            returnValue: _i5.Future<String?>.value(),
+            returnValueForMissingStub: _i5.Future<String?>.value(),
+          )
+          as _i5.Future<String?>);
+
+  @override
+  _i5.Future<void> removeAddressName(String? address) =>
+      (super.noSuchMethod(
+            Invocation.method(#removeAddressName, [address]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<bool> getHasWallet() =>
+      (super.noSuchMethod(
+            Invocation.method(#getHasWallet, []),
+            returnValue: _i5.Future<bool>.value(false),
+            returnValueForMissingStub: _i5.Future<bool>.value(false),
+          )
+          as _i5.Future<bool>);
+
+  @override
+  _i5.Future<bool> isWalletLoggedOut() =>
+      (super.noSuchMethod(
+            Invocation.method(#isWalletLoggedOut, []),
+            returnValue: _i5.Future<bool>.value(false),
+            returnValueForMissingStub: _i5.Future<bool>.value(false),
+          )
+          as _i5.Future<bool>);
+
+  @override
+  String getMnemonicKey(int? walletIndex) =>
+      (super.noSuchMethod(
+            Invocation.method(#getMnemonicKey, [walletIndex]),
+            returnValue: _i7.dummyValue<String>(this, Invocation.method(#getMnemonicKey, [walletIndex])),
+            returnValueForMissingStub: _i7.dummyValue<String>(this, Invocation.method(#getMnemonicKey, [walletIndex])),
+          )
+          as String);
+
+  @override
+  _i5.Future<void> setMnemonic(String? mnemonic, int? walletIndex) =>
+      (super.noSuchMethod(
+            Invocation.method(#setMnemonic, [mnemonic, walletIndex]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<String?> getMnemonic(int? walletIndex) =>
+      (super.noSuchMethod(
+            Invocation.method(#getMnemonic, [walletIndex]),
+            returnValue: _i5.Future<String?>.value(),
+            returnValueForMissingStub: _i5.Future<String?>.value(),
+          )
+          as _i5.Future<String?>);
+
+  @override
+  _i5.Future<void> setReversibleEnabled(bool? enabled) =>
+      (super.noSuchMethod(
+            Invocation.method(#setReversibleEnabled, [enabled]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  bool isReversibleEnabled() =>
+      (super.noSuchMethod(
+            Invocation.method(#isReversibleEnabled, []),
+            returnValue: false,
+            returnValueForMissingStub: false,
+          )
+          as bool);
+
+  @override
+  _i5.Future<void> setReversibleTimeSeconds(int? seconds) =>
+      (super.noSuchMethod(
+            Invocation.method(#setReversibleTimeSeconds, [seconds]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<int?> getReversibleTimeSeconds() =>
+      (super.noSuchMethod(
+            Invocation.method(#getReversibleTimeSeconds, []),
+            returnValue: _i5.Future<int?>.value(),
+            returnValueForMissingStub: _i5.Future<int?>.value(),
+          )
+          as _i5.Future<int?>);
+
+  @override
+  _i5.Future<void> setBalanceHidden(bool? hidden) =>
+      (super.noSuchMethod(
+            Invocation.method(#setBalanceHidden, [hidden]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  bool isBalanceHidden() =>
+      (super.noSuchMethod(Invocation.method(#isBalanceHidden, []), returnValue: false, returnValueForMissingStub: false)
+          as bool);
+
+  @override
+  _i5.Future<void> setCurrencyFlipped(bool? flipped) =>
+      (super.noSuchMethod(
+            Invocation.method(#setCurrencyFlipped, [flipped]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  bool isCurrencyFlipped() =>
+      (super.noSuchMethod(
+            Invocation.method(#isCurrencyFlipped, []),
+            returnValue: false,
+            returnValueForMissingStub: false,
+          )
+          as bool);
+
+  @override
+  _i5.Future<void> setSelectedFiatCurrency(String? currencyCode) =>
+      (super.noSuchMethod(
+            Invocation.method(#setSelectedFiatCurrency, [currencyCode]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> setPosModeEnabled(bool? enabled) =>
+      (super.noSuchMethod(
+            Invocation.method(#setPosModeEnabled, [enabled]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  bool isPosModeEnabled() =>
+      (super.noSuchMethod(
+            Invocation.method(#isPosModeEnabled, []),
+            returnValue: false,
+            returnValueForMissingStub: false,
+          )
+          as bool);
+
+  @override
+  bool? getBool(String? key) =>
+      (super.noSuchMethod(Invocation.method(#getBool, [key]), returnValueForMissingStub: null) as bool?);
+
+  @override
+  _i5.Future<void> setBool(String? key, bool? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setBool, [key, value]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  String? getString(String? key) =>
+      (super.noSuchMethod(Invocation.method(#getString, [key]), returnValueForMissingStub: null) as String?);
+
+  @override
+  _i5.Future<void> setString(String? key, String? value) =>
+      (super.noSuchMethod(
+            Invocation.method(#setString, [key, value]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  void setLastPausedTime(DateTime? time) =>
+      super.noSuchMethod(Invocation.method(#setLastPausedTime, [time]), returnValueForMissingStub: null);
+
+  @override
+  void cleanLastPausedTime() =>
+      super.noSuchMethod(Invocation.method(#cleanLastPausedTime, []), returnValueForMissingStub: null);
+
+  @override
+  bool hasOldAccounts() =>
+      (super.noSuchMethod(Invocation.method(#hasOldAccounts, []), returnValue: false, returnValueForMissingStub: false)
+          as bool);
+
+  @override
+  List<_i2.Account> getOldAccounts() =>
+      (super.noSuchMethod(
+            Invocation.method(#getOldAccounts, []),
+            returnValue: <_i2.Account>[],
+            returnValueForMissingStub: <_i2.Account>[],
+          )
+          as List<_i2.Account>);
+
+  @override
+  _i5.Future<void> clearOldAccounts() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearOldAccounts, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> setOldAccountsData(String? jsonData) =>
+      (super.noSuchMethod(
+            Invocation.method(#setOldAccountsData, [jsonData]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  void resetForTest() => super.noSuchMethod(Invocation.method(#resetForTest, []), returnValueForMissingStub: null);
+
+  @override
+  _i5.Future<void> clearAll() =>
+      (super.noSuchMethod(
+            Invocation.method(#clearAll, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  bool referralCheckCompleted() =>
+      (super.noSuchMethod(
+            Invocation.method(#referralCheckCompleted, []),
+            returnValue: false,
+            returnValueForMissingStub: false,
+          )
+          as bool);
+
+  @override
+  void setReferralCheckCompleted() =>
+      super.noSuchMethod(Invocation.method(#setReferralCheckCompleted, []), returnValueForMissingStub: null);
+
+  @override
+  void clearReferralCheckCompletedFlag() =>
+      super.noSuchMethod(Invocation.method(#clearReferralCheckCompletedFlag, []), returnValueForMissingStub: null);
+
+  @override
+  void setReferralCode(String? code) =>
+      super.noSuchMethod(Invocation.method(#setReferralCode, [code]), returnValueForMissingStub: null);
+
+  @override
+  bool hasWatchedQuestsPromo() =>
+      (super.noSuchMethod(
+            Invocation.method(#hasWatchedQuestsPromo, []),
+            returnValue: false,
+            returnValueForMissingStub: false,
+          )
+          as bool);
+
+  @override
+  void setQuestsPromoWatched() =>
+      super.noSuchMethod(Invocation.method(#setQuestsPromoWatched, []), returnValueForMissingStub: null);
+
+  @override
+  void clearQuestsPromoWatchedFlag() =>
+      super.noSuchMethod(Invocation.method(#clearQuestsPromoWatchedFlag, []), returnValueForMissingStub: null);
+
+  @override
+  bool existingUserSeenPromoVideo() =>
+      (super.noSuchMethod(
+            Invocation.method(#existingUserSeenPromoVideo, []),
+            returnValue: false,
+            returnValueForMissingStub: false,
+          )
+          as bool);
+
+  @override
+  void setExistingUserSeenPromoVideo() =>
+      super.noSuchMethod(Invocation.method(#setExistingUserSeenPromoVideo, []), returnValueForMissingStub: null);
+
+  @override
+  void clearExistingUserSeenPromoVideoFlag() =>
+      super.noSuchMethod(Invocation.method(#clearExistingUserSeenPromoVideoFlag, []), returnValueForMissingStub: null);
+}
+
+/// A class which mocks [AccountsService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockAccountsService extends _i1.Mock implements _i4.AccountsService {
+  @override
+  set onAccountsChanged(void Function()? _onAccountsChanged) =>
+      super.noSuchMethod(Invocation.setter(#onAccountsChanged, _onAccountsChanged), returnValueForMissingStub: null);
+
+  @override
+  _i5.Future<_i2.Account> createNewAccount({required int? walletIndex}) =>
+      (super.noSuchMethod(
+            Invocation.method(#createNewAccount, [], {#walletIndex: walletIndex}),
+            returnValue: _i5.Future<_i2.Account>.value(
+              _FakeAccount_0(this, Invocation.method(#createNewAccount, [], {#walletIndex: walletIndex})),
+            ),
+            returnValueForMissingStub: _i5.Future<_i2.Account>.value(
+              _FakeAccount_0(this, Invocation.method(#createNewAccount, [], {#walletIndex: walletIndex})),
+            ),
+          )
+          as _i5.Future<_i2.Account>);
+
+  @override
+  _i5.Future<void> updateAccountName(_i2.Account? account, String? name) =>
+      (super.noSuchMethod(
+            Invocation.method(#updateAccountName, [account, name]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> addAccount(_i2.Account? newAccount) =>
+      (super.noSuchMethod(
+            Invocation.method(#addAccount, [newAccount]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<List<_i2.Account>> getAccounts() =>
+      (super.noSuchMethod(
+            Invocation.method(#getAccounts, []),
+            returnValue: _i5.Future<List<_i2.Account>>.value(<_i2.Account>[]),
+            returnValueForMissingStub: _i5.Future<List<_i2.Account>>.value(<_i2.Account>[]),
+          )
+          as _i5.Future<List<_i2.Account>>);
+
+  @override
+  _i5.Future<void> removeAccount(_i2.Account? account) =>
+      (super.noSuchMethod(
+            Invocation.method(#removeAccount, [account]),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+}
+
+/// A class which mocks [ReferralService].
+///
+/// See the documentation for Mockito's code generation for more information.
+class MockReferralService extends _i1.Mock implements _i8.ReferralService {
+  @override
+  _i5.Future<void> checkPlayStoreReferralCode() =>
+      (super.noSuchMethod(
+            Invocation.method(#checkPlayStoreReferralCode, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> optInRewardProgram() =>
+      (super.noSuchMethod(
+            Invocation.method(#optInRewardProgram, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<String?> getReferralData() =>
+      (super.noSuchMethod(
+            Invocation.method(#getReferralData, []),
+            returnValue: _i5.Future<String?>.value(),
+            returnValueForMissingStub: _i5.Future<String?>.value(),
+          )
+          as _i5.Future<String?>);
+
+  @override
+  void invalidateCache() =>
+      super.noSuchMethod(Invocation.method(#invalidateCache, []), returnValueForMissingStub: null);
+
+  @override
+  _i5.Future<bool> getRewardProgramParticiation() =>
+      (super.noSuchMethod(
+            Invocation.method(#getRewardProgramParticiation, []),
+            returnValue: _i5.Future<bool>.value(false),
+            returnValueForMissingStub: _i5.Future<bool>.value(false),
+          )
+          as _i5.Future<bool>);
+
+  @override
+  _i5.Future<void> submitReferralToBackend({required String? referral}) =>
+      (super.noSuchMethod(
+            Invocation.method(#submitReferralToBackend, [], {#referral: referral}),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  _i5.Future<void> submitAddressToBackend() =>
+      (super.noSuchMethod(
+            Invocation.method(#submitAddressToBackend, []),
+            returnValue: _i5.Future<void>.value(),
+            returnValueForMissingStub: _i5.Future<void>.value(),
+          )
+          as _i5.Future<void>);
+
+  @override
+  String generateReferralLink(String? referralCode) =>
+      (super.noSuchMethod(
+            Invocation.method(#generateReferralLink, [referralCode]),
+            returnValue: _i7.dummyValue<String>(this, Invocation.method(#generateReferralLink, [referralCode])),
+            returnValueForMissingStub: _i7.dummyValue<String>(
+              this,
+              Invocation.method(#generateReferralLink, [referralCode]),
+            ),
+          )
+          as String);
+
+  @override
+  _i5.Future<_i2.Account> getMainAccount() =>
+      (super.noSuchMethod(
+            Invocation.method(#getMainAccount, []),
+            returnValue: _i5.Future<_i2.Account>.value(_FakeAccount_0(this, Invocation.method(#getMainAccount, []))),
+            returnValueForMissingStub: _i5.Future<_i2.Account>.value(
+              _FakeAccount_0(this, Invocation.method(#getMainAccount, [])),
+            ),
+          )
+          as _i5.Future<_i2.Account>);
+
+  @override
+  _i5.Future<String> getMyInviteCode() =>
+      (super.noSuchMethod(
+            Invocation.method(#getMyInviteCode, []),
+            returnValue: _i5.Future<String>.value(
+              _i7.dummyValue<String>(this, Invocation.method(#getMyInviteCode, [])),
+            ),
+            returnValueForMissingStub: _i5.Future<String>.value(
+              _i7.dummyValue<String>(this, Invocation.method(#getMyInviteCode, [])),
+            ),
+          )
+          as _i5.Future<String>);
+
+  @override
+  _i5.Future<_i3.ShareParams> getShareLinkParameters(_i9.Rect? positionOrigin) =>
+      (super.noSuchMethod(
+            Invocation.method(#getShareLinkParameters, [positionOrigin]),
+            returnValue: _i5.Future<_i3.ShareParams>.value(
+              _FakeShareParams_1(this, Invocation.method(#getShareLinkParameters, [positionOrigin])),
+            ),
+            returnValueForMissingStub: _i5.Future<_i3.ShareParams>.value(
+              _FakeShareParams_1(this, Invocation.method(#getShareLinkParameters, [positionOrigin])),
+            ),
+          )
+          as _i5.Future<_i3.ShareParams>);
+}
diff --git a/quantus_sdk/lib/quantus_sdk.dart b/quantus_sdk/lib/quantus_sdk.dart
index c76e8ce54..2ffd2b988 100644
--- a/quantus_sdk/lib/quantus_sdk.dart
+++ b/quantus_sdk/lib/quantus_sdk.dart
@@ -31,6 +31,7 @@ export 'src/models/pending_transfer_event.dart';
 export 'src/models/reversible_transfer_status.dart';
 export 'src/models/sorted_transactions.dart';
 export 'src/models/transaction_event.dart';
+export 'src/models/transaction_filter.dart';
 export 'src/models/transaction_state.dart';
 export 'src/models/raider_submissions.dart';
 export 'src/models/raid_quest.dart';
@@ -53,6 +54,7 @@ export 'src/services/high_security_service.dart';
 export 'src/services/human_readable_checksum_service.dart';
 export 'src/services/migration_service.dart';
 export 'src/services/network/redundant_endpoint.dart';
+export 'src/services/locale_number_config.dart';
 export 'src/services/number_formatting_service.dart';
 export 'src/services/recent_addresses_service.dart';
 export 'src/services/recovery_service.dart';
diff --git a/quantus_sdk/lib/src/constants/app_constants.dart b/quantus_sdk/lib/src/constants/app_constants.dart
index d7749b555..16452ecac 100644
--- a/quantus_sdk/lib/src/constants/app_constants.dart
+++ b/quantus_sdk/lib/src/constants/app_constants.dart
@@ -5,6 +5,8 @@ class AppConstants {
   static const String tokenSymbol = 'QUAN'; // fetch this from chain eventually
   static const String shareUrl = 'https://linktr.ee/quantusnetwork';
   static const String websiteBaseUrl = 'https://www.quantus.com';
+  static const String emailSupport = 'support@quantus.com';
+  static const String telegramHandle = '@quantusnetwork';
 
   // static const List<String> rpcEndpoints = ['ws://127.0.0.1:9944']; // local testing
   // static const List<String> graphQlEndpoints = ['http://127.0.0.1:4350']; // local testing
diff --git a/quantus_sdk/lib/src/extensions/decimal_input_filter.dart b/quantus_sdk/lib/src/extensions/decimal_input_filter.dart
index b98d962e0..db97f1657 100644
--- a/quantus_sdk/lib/src/extensions/decimal_input_filter.dart
+++ b/quantus_sdk/lib/src/extensions/decimal_input_filter.dart
@@ -1,26 +1,114 @@
 import 'package:flutter/services.dart';
+import 'package:quantus_sdk/src/services/locale_number_config.dart';
 
+/// A locale-aware [TextInputFormatter] that:
+/// - Accepts BOTH `.` and `,` as the decimal separator during **typing**
+///   (because mobile keyboards may show either regardless of locale).
+/// - Applies locale rules (strips grouping separators) during **paste**.
+/// - Enforces a maximum number of decimal places (useful for fiat currencies
+///   with 0 decimals like IDR/JPY).
+/// - Prevents leading zeros (except for `0` followed by the decimal separator).
+/// - Normalizes displayed text to use the locale's decimal separator.
 class DecimalInputFilter extends TextInputFormatter {
-  final RegExp decimalRegex = RegExp(r'^(0|([1-9]\d*))([,.]\d{0,12})?$|^$');
+  final LocaleNumberConfig localeConfig;
+  final int? maxDecimalPlaces;
+
+  /// Creates a locale-aware decimal input filter.
+  ///
+  /// [localeConfig] determines which characters are the decimal and grouping
+  /// separators. Defaults to [LocaleNumberConfig.dotDecimal] (US format).
+  ///
+  /// [maxDecimalPlaces] restricts how many digits after the decimal separator
+  /// are allowed. Pass `0` to block decimal input entirely (e.g. for IDR/JPY).
+  /// Pass `null` for the default maximum of 12 digits.
+  DecimalInputFilter({LocaleNumberConfig? localeConfig, this.maxDecimalPlaces})
+    : localeConfig = localeConfig ?? LocaleNumberConfig.dotDecimal;
 
   @override
   TextEditingValue formatEditUpdate(TextEditingValue oldValue, TextEditingValue newValue) {
-    // Allow empty input
-    if (newValue.text.isEmpty) {
-      return newValue;
+    if (newValue.text.isEmpty) return newValue;
+
+    final sep = localeConfig.decimalSeparator;
+    final groupSep = localeConfig.groupingSeparator;
+
+    // Detect paste vs typing: paste inserts multiple characters at once.
+    final bool isPaste = (newValue.text.length - oldValue.text.length) > 1;
+
+    String text;
+
+    if (isPaste) {
+      // PASTE MODE: apply full locale rules.
+      // Strip grouping separators and keep the locale's decimal separator.
+      text = newValue.text.replaceAll(groupSep, '');
+    } else {
+      // TYPING MODE: accept EITHER `.` or `,` as a decimal separator attempt.
+      // Mobile keyboards may show either symbol regardless of locale.
+      text = newValue.text;
+
+      final hasDecimalAlready = oldValue.text.contains(sep);
+
+      if (!hasDecimalAlready && text.contains(groupSep) && !oldValue.text.contains(groupSep)) {
+        // No decimal yet → user typed the "other" separator intending decimal.
+        text = text.replaceFirst(groupSep, sep);
+      } else if (hasDecimalAlready && text.contains(groupSep) && !oldValue.text.contains(groupSep)) {
+        // Already has a decimal → reject the newly typed separator entirely.
+        return oldValue;
+      }
     }
 
-    // Allow single commas or dots
-    if (newValue.text == ',' || newValue.text == '.') {
-      return TextEditingValue(text: '0${newValue.text}');
+    // Handle lone decimal separator → "0," or "0."
+    if (text == sep || text == '.' || text == ',') {
+      if (maxDecimalPlaces == 0) return oldValue;
+      return TextEditingValue(text: '0$sep', selection: const TextSelection.collapsed(offset: 2));
     }
 
-    // Check if the new value matches our regex
-    if (decimalRegex.hasMatch(newValue.text)) {
-      return newValue;
+    // Handle leading decimal separator (e.g., ",5" → "0,5" or ".5" → "0.5")
+    if (text.startsWith(sep) || text.startsWith('.') || text.startsWith(',')) {
+      if (maxDecimalPlaces == 0) return oldValue;
+      // Normalize the leading separator to the locale's decimal separator.
+      if (text.startsWith('.') || text.startsWith(',')) {
+        text = sep + text.substring(1);
+      }
+      text = '0$text';
+    }
+
+    // Normalize to canonical form (dot decimal) for validation.
+    final normalized = localeConfig.normalize(text);
+
+    // Build validation regex based on maxDecimalPlaces.
+    final String decimalRegexPart;
+    if (maxDecimalPlaces == 0) {
+      decimalRegexPart = '';
     } else {
-      // Return the old value if new input doesn't match
-      return oldValue;
+      final maxDp = maxDecimalPlaces ?? 12;
+      decimalRegexPart =
+          r'(\.\d{0,'
+          '$maxDp'
+          r'})?';
+    }
+    final regex = RegExp('^(0|([1-9]\\d*))$decimalRegexPart\$');
+
+    if (regex.hasMatch(normalized)) {
+      // Ensure the text uses the locale's decimal separator for display.
+      final displayText = _ensureLocaleDecimal(text);
+
+      if (displayText != newValue.text) {
+        return TextEditingValue(
+          text: displayText,
+          selection: TextSelection.collapsed(offset: displayText.length),
+        );
+      }
+      return newValue;
     }
+
+    return oldValue;
+  }
+
+  /// Ensures the text uses only the locale's decimal separator.
+  /// Converts any `.` or `,` to the locale's decimal separator.
+  String _ensureLocaleDecimal(String text) {
+    final sep = localeConfig.decimalSeparator;
+    final other = sep == '.' ? ',' : '.';
+    return text.replaceAll(other, sep);
   }
 }
diff --git a/quantus_sdk/lib/src/models/exchange_rates_result.dart b/quantus_sdk/lib/src/models/exchange_rates_result.dart
new file mode 100644
index 000000000..8ec100218
--- /dev/null
+++ b/quantus_sdk/lib/src/models/exchange_rates_result.dart
@@ -0,0 +1,14 @@
+class ExchangeRatesResult {
+  final Map<String, double> rates;
+  final int timeNextUpdateUnix;
+
+  const ExchangeRatesResult({required this.rates, required this.timeNextUpdateUnix});
+
+  factory ExchangeRatesResult.fromJson(Map<String, dynamic> json) {
+    final conversionRates = json['conversion_rates'] as Map<String, dynamic>;
+    return ExchangeRatesResult(
+      rates: conversionRates.map((k, v) => MapEntry(k, (v as num).toDouble())),
+      timeNextUpdateUnix: json['time_next_update_unix'] as int,
+    );
+  }
+}
diff --git a/quantus_sdk/lib/src/models/transaction_filter.dart b/quantus_sdk/lib/src/models/transaction_filter.dart
new file mode 100644
index 000000000..99c23209d
--- /dev/null
+++ b/quantus_sdk/lib/src/models/transaction_filter.dart
@@ -0,0 +1,14 @@
+enum TransactionFilter { all, send, receive }
+
+extension TransactionFilterDisplayName on TransactionFilter {
+  String get displayName {
+    switch (this) {
+      case TransactionFilter.all:
+        return 'All';
+      case TransactionFilter.send:
+        return 'Send';
+      case TransactionFilter.receive:
+        return 'Receive';
+    }
+  }
+}
diff --git a/quantus_sdk/lib/src/services/address_formatting_service.dart b/quantus_sdk/lib/src/services/address_formatting_service.dart
index 78dd13ae2..b80dac211 100644
--- a/quantus_sdk/lib/src/services/address_formatting_service.dart
+++ b/quantus_sdk/lib/src/services/address_formatting_service.dart
@@ -1,7 +1,7 @@
 import 'package:quantus_sdk/quantus_sdk.dart';
 
 class AddressFormattingService {
-  static String formatAddress(String address, {int prefix = 5, String ellipses = '...', int postFix = 5}) {
+  static String formatAddress(String address, {int prefix = 6, String ellipses = '...', int postFix = 6}) {
     return address.shortenedCryptoAddress(prefix: prefix, ellipses: ellipses, postFix: postFix);
   }
 
diff --git a/quantus_sdk/lib/src/services/chain_history_service.dart b/quantus_sdk/lib/src/services/chain_history_service.dart
index 415a90dc1..2815ffe96 100644
--- a/quantus_sdk/lib/src/services/chain_history_service.dart
+++ b/quantus_sdk/lib/src/services/chain_history_service.dart
@@ -20,17 +20,28 @@ class _Page<T> {
 class ChainHistoryService {
   final GraphQlEndpointService _graphQlEndpointService = GraphQlEndpointService();
 
-  // We don't need a client instance anymore, just the endpoint
   ChainHistoryService();
 
-  final String _scheduledReversibleTransfersQuery = r'''
-query ScheduledReversibleTransfersByAccounts($accounts: [String!]!, $limit: Int!, $offset: Int!, $after: DateTime!) {
-  accountEvents(limit: $limit, 
-    offset: $offset, 
+  String _buildScheduledReversibleTransfersQuery(TransactionFilter filter) {
+    final String directionCondition;
+    switch (filter) {
+      case TransactionFilter.send:
+        directionCondition =
+            'account: {id_in: \$accounts}, scheduledReversibleTransfer: {from: {id_in: \$accounts}, scheduledAt_gt: \$after}';
+      case TransactionFilter.receive:
+        directionCondition =
+            'account: {id_in: \$accounts}, scheduledReversibleTransfer: {to: {id_in: \$accounts}, scheduledAt_gt: \$after}';
+      case TransactionFilter.all:
+        directionCondition = 'account: {id_in: \$accounts}, scheduledReversibleTransfer: {scheduledAt_gt: \$after}';
+    }
+
+    return '''
+query ScheduledReversibleTransfersByAccounts(\$accounts: [String!]!, \$limit: Int!, \$offset: Int!, \$after: DateTime!) {
+  accountEvents(limit: \$limit, 
+    offset: \$offset, 
     where: {
-      account: {id_in: $accounts},
       scheduledReversibleTransfer_isNull: false,
-      scheduledReversibleTransfer: {scheduledAt_gt: $after}
+      $directionCondition
     }, orderBy: timestamp_DESC
   ) {
     id
@@ -58,10 +69,58 @@ query ScheduledReversibleTransfersByAccounts($accounts: [String!]!, $limit: Int!
   }
 }
 ''';
+  }
 
-  final String _accountEventsQuery = r'''
-query AccountEvents($accounts: [String!]!, $limit: Int!, $offset: Int!) {
-  accountEvents(limit: $limit, offset: $offset, where: {AND: [{account: {id_in: $accounts}, balanceEvent_isNull: true, scheduledReversibleTransfer_isNull: true}, {OR: [{transfer_isNull: true}, {transfer: {extrinsic_isNull: false}}]}]}, orderBy: timestamp_DESC) {
+  /// Builds the account-events (other transfers) query.
+  ///
+  /// When [filter] is [TransactionFilter.send] or [TransactionFilter.receive],
+  /// a direction-specific condition is injected so the database only returns
+  /// matching rows instead of filtering client-side.
+  ///
+  /// Mining rewards are always a "receive", so they are excluded when the
+  /// filter is [TransactionFilter.send] and included otherwise.
+  String _buildAccountEventsQuery(TransactionFilter filter) {
+    // The base condition that applies to every variant
+    const String baseCondition = 'balanceEvent_isNull: true, scheduledReversibleTransfer_isNull: true';
+
+    // Transfer extrinsic guard — only include on-chain transfers
+    const String transferGuard = '{OR: [{transfer_isNull: true}, {transfer: {extrinsic_isNull: false}}]}';
+
+    // Whether to include the minerReward field in the response
+    final bool includeMinerReward = filter != TransactionFilter.send;
+
+    final String minerRewardField = includeMinerReward
+        ? '''
+    minerReward {
+      id
+      reward
+      timestamp
+      miner {
+        id
+      }
+      block {
+        height
+        hash
+      }
+    }'''
+        : '';
+
+    final String whereClause;
+
+    switch (filter) {
+      case TransactionFilter.send:
+        whereClause =
+            '{AND: [{account: {id_in: \$accounts}, $baseCondition}, $transferGuard, {OR: [{transfer: {from: {id_in: \$accounts}}}, {executedReversibleTransfer: {scheduledTransfer: {from: {id_in: \$accounts}}}}, {cancelledReversibleTransfer: {scheduledTransfer: {from: {id_in: \$accounts}}}}]}]}';
+      case TransactionFilter.receive:
+        whereClause =
+            '{AND: [{account: {id_in: \$accounts}, $baseCondition}, $transferGuard, {OR: [{transfer: {to: {id_in: \$accounts}}}, {executedReversibleTransfer: {scheduledTransfer: {to: {id_in: \$accounts}}}}, {cancelledReversibleTransfer: {scheduledTransfer: {to: {id_in: \$accounts}}}}, {minerReward_isNull: false}]}]}';
+      case TransactionFilter.all:
+        whereClause = '{AND: [{account: {id_in: \$accounts}, $baseCondition}, $transferGuard]}';
+    }
+
+    return '''
+query AccountEvents(\$accounts: [String!]!, \$limit: Int!, \$offset: Int!) {
+  accountEvents(limit: \$limit, offset: \$offset, where: $whereClause, orderBy: timestamp_DESC) {
     id
     transfer {
       id
@@ -126,22 +185,11 @@ query AccountEvents($accounts: [String!]!, $limit: Int!, $offset: Int!) {
         }
         scheduledAt
       }
-    }
-    minerReward {
-      id
-      reward
-      timestamp
-      miner {
-        id
-      }
-      block {
-        height
-        hash
-      }
-    }
+    }$minerRewardField
   }
 }
 ''';
+  }
 
   // GraphQL query to fetch transactions by their hash
   final String _executedTransactionByTxId = r'''
@@ -408,24 +456,16 @@ query SearchByExtrinsicHash($extrinsicHash: String!) {
     }
   }
 
-  Future<List<ReversibleTransferEvent>> fetchScheduledReversibleTransfers({
-    required List<String> accountIds,
-    int limit = 10,
-    int offset = 0,
-  }) async {
-    final page = await _fetchScheduledReversibleTransfersPage(accountIds: accountIds, limit: limit, offset: offset);
-    return page.items;
-  }
-
   Future<_Page<ReversibleTransferEvent>> _fetchScheduledReversibleTransfersPage({
     required List<String> accountIds,
     int limit = 10,
     int offset = 0,
+    required TransactionFilter filter,
   }) async {
     final after = DateTime.now().subtract(const Duration(minutes: 2)).toUtc().toIso8601String();
 
     final Map<String, dynamic> requestBody = {
-      'query': _scheduledReversibleTransfersQuery,
+      'query': _buildScheduledReversibleTransfersQuery(filter),
       'variables': {'accounts': accountIds, 'limit': _lookaheadLimit(limit), 'offset': offset, 'after': after},
     };
 
@@ -461,9 +501,10 @@ query SearchByExtrinsicHash($extrinsicHash: String!) {
     required List<String> accountIds,
     int limit = 10,
     int offset = 0,
+    required TransactionFilter filter,
   }) async {
     final Map<String, dynamic> requestBody = {
-      'query': _accountEventsQuery,
+      'query': _buildAccountEventsQuery(filter),
       'variables': {'accounts': accountIds, 'limit': _lookaheadLimit(limit), 'offset': offset},
     };
 
@@ -501,11 +542,17 @@ query SearchByExtrinsicHash($extrinsicHash: String!) {
     int limit = 20,
     int otherOffset = 0,
     int scheduledOffset = 0,
+    required TransactionFilter filter,
   }) async {
     try {
       final results = await Future.wait([
-        _fetchScheduledReversibleTransfersPage(accountIds: accountIds, limit: limit, offset: scheduledOffset),
-        fetchOtherTransfers(accountIds: accountIds, limit: limit, offset: otherOffset),
+        _fetchScheduledReversibleTransfersPage(
+          accountIds: accountIds,
+          limit: limit,
+          offset: scheduledOffset,
+          filter: filter,
+        ),
+        fetchOtherTransfers(accountIds: accountIds, limit: limit, offset: otherOffset, filter: filter),
       ]);
 
       final scheduledReversibleTransfers = results[0] as _Page<ReversibleTransferEvent>;
diff --git a/quantus_sdk/lib/src/services/datetime_formatting_service.dart b/quantus_sdk/lib/src/services/datetime_formatting_service.dart
index 24c441686..962e2b3ad 100644
--- a/quantus_sdk/lib/src/services/datetime_formatting_service.dart
+++ b/quantus_sdk/lib/src/services/datetime_formatting_service.dart
@@ -69,6 +69,10 @@ class DatetimeFormattingService {
     return DateFormat('dd-MM-yyyy HH:mm:ss').format(timestamp.toLocal());
   }
 
+  static String formatTxDateTime(DateTime timestamp) {
+    return DateFormat('MMM d, yyyy · h:mm a').format(timestamp.toLocal());
+  }
+
   /// Helper function to format future durations.
   static String _formatFuture(Duration duration) {
     if (duration.inSeconds < 10) {
diff --git a/quantus_sdk/lib/src/services/locale_number_config.dart b/quantus_sdk/lib/src/services/locale_number_config.dart
new file mode 100644
index 000000000..9172d7f3e
--- /dev/null
+++ b/quantus_sdk/lib/src/services/locale_number_config.dart
@@ -0,0 +1,144 @@
+import 'package:decimal/decimal.dart';
+import 'package:intl/intl.dart';
+
+/// Thrown by [LocaleNumberConfig.parseDecimal] when the input cannot be parsed
+/// as a decimal number after locale normalization. Callers should catch this
+/// at the UI boundary and present a user-friendly message.
+class InvalidNumberInputException implements Exception {
+  final String rawInput;
+  final String normalized;
+
+  const InvalidNumberInputException({required this.rawInput, required this.normalized});
+
+  @override
+  String toString() => 'InvalidNumberInputException(raw: "$rawInput", normalized: "$normalized")';
+}
+
+/// Encapsulates locale-specific number formatting rules (decimal and grouping
+/// separators) so that input parsing, validation, and display are consistent
+/// with the user's device locale.
+class LocaleNumberConfig {
+  final String decimalSeparator;
+  final String groupingSeparator;
+  final String locale;
+
+  const LocaleNumberConfig({required this.decimalSeparator, required this.groupingSeparator, required this.locale});
+
+  /// Standard US/UK config: dot decimal, comma thousands.
+  static const dotDecimal = LocaleNumberConfig(decimalSeparator: '.', groupingSeparator: ',', locale: 'en_US');
+
+  /// European/Indonesian config: comma decimal, dot thousands.
+  static const commaDecimal = LocaleNumberConfig(decimalSeparator: ',', groupingSeparator: '.', locale: 'id_ID');
+
+  /// Creates a [LocaleNumberConfig] from the device locale string (e.g. 'en_US', 'id_ID').
+  factory LocaleNumberConfig.fromLocale(String locale) {
+    final format = NumberFormat.decimalPattern(locale);
+    final symbols = format.symbols;
+    return LocaleNumberConfig(
+      decimalSeparator: symbols.DECIMAL_SEP,
+      groupingSeparator: symbols.GROUP_SEP,
+      locale: locale,
+    );
+  }
+
+  /// Creates a [LocaleNumberConfig] from the current default locale.
+  factory LocaleNumberConfig.fromDefaultLocale() {
+    return LocaleNumberConfig.fromLocale(Intl.defaultLocale ?? 'en_US');
+  }
+
+  /// Whether this locale uses comma as the decimal separator.
+  bool get isCommaDecimal => decimalSeparator == ',';
+
+  /// Normalizes a locale-formatted input string to a canonical format
+  /// (dot as decimal separator, no grouping separators) suitable for
+  /// [Decimal.parse] or [double.parse].
+  ///
+  /// Examples (Indonesian locale where `,` = decimal, `.` = thousands):
+  ///   '1.000,50' → '1000.50'
+  ///   '1000,5'   → '1000.5'
+  ///   '1.000'    → '1000'
+  ///
+  /// Examples (US locale where `.` = decimal, `,` = thousands):
+  ///   '1,000.50' → '1000.50'
+  ///   '1000.5'   → '1000.5'
+  ///   '1,000'    → '1000'
+  String normalize(String input) {
+    if (input.isEmpty) return input;
+
+    String result = input;
+
+    // Remove grouping separators. Skip when grouping equals decimal — under any
+    // sensible locale this never holds, but guarding keeps the helper safe if
+    // it's ever fed a hand-rolled config.
+    if (groupingSeparator.isNotEmpty && groupingSeparator != decimalSeparator) {
+      result = result.replaceAll(groupingSeparator, '');
+    }
+
+    if (decimalSeparator != '.') {
+      result = result.replaceAll(decimalSeparator, '.');
+    }
+
+    return result;
+  }
+
+  /// Parses a locale-formatted numeric string into a [Decimal].
+  ///
+  /// Tolerates a single trailing decimal separator with no fractional digits
+  /// (e.g. `"1."` in en_US or `"1,"` in id_ID) so mid-typing keystrokes don't
+  /// look like garbage to callers — `"1."` parses as `Decimal.one`. Strings
+  /// with more than one decimal mark (e.g. `"1.2."`) still throw.
+  ///
+  /// Throws [InvalidNumberInputException] when the input cannot be parsed.
+  /// Empty input also throws — callers that want to treat empty as zero should
+  /// short-circuit before calling.
+  Decimal parseDecimal(String input) {
+    final normalized = normalize(input);
+    final canonical = (normalized.endsWith('.') && '.'.allMatches(normalized).length == 1)
+        ? normalized.substring(0, normalized.length - 1)
+        : normalized;
+    final result = Decimal.tryParse(canonical);
+    if (result == null) {
+      throw InvalidNumberInputException(rawInput: input, normalized: normalized);
+    }
+    return result;
+  }
+
+  /// Converts a canonical numeric string (dot decimal, no grouping) to the
+  /// locale's display format.
+  ///
+  /// If [addGroupingSeparators] is true, thousands grouping is applied.
+  String localize(String canonicalInput, {bool addGroupingSeparators = true}) {
+    if (canonicalInput.isEmpty) return canonicalInput;
+
+    final parts = canonicalInput.split('.');
+    String integerPart = parts[0];
+    final decimalPart = parts.length > 1 ? parts[1] : null;
+
+    if (addGroupingSeparators && integerPart.length > 3) {
+      integerPart = integerPart.replaceAllMapped(
+        RegExp(r'(\d{1,3})(?=(\d{3})+(?!\d))'),
+        (Match m) => '${m[1]}$groupingSeparator',
+      );
+    }
+
+    if (decimalPart != null) {
+      return '$integerPart$decimalSeparator$decimalPart';
+    }
+    return integerPart;
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is LocaleNumberConfig &&
+          runtimeType == other.runtimeType &&
+          decimalSeparator == other.decimalSeparator &&
+          groupingSeparator == other.groupingSeparator;
+
+  @override
+  int get hashCode => decimalSeparator.hashCode ^ groupingSeparator.hashCode;
+
+  @override
+  String toString() =>
+      'LocaleNumberConfig(decimal: "$decimalSeparator", grouping: "$groupingSeparator", locale: "$locale")';
+}
diff --git a/quantus_sdk/lib/src/services/number_formatting_service.dart b/quantus_sdk/lib/src/services/number_formatting_service.dart
index 40debb766..09c38bbaa 100644
--- a/quantus_sdk/lib/src/services/number_formatting_service.dart
+++ b/quantus_sdk/lib/src/services/number_formatting_service.dart
@@ -1,68 +1,55 @@
-// Keep for potential future use (grouping)
 import 'package:decimal/decimal.dart';
 import 'package:flutter/foundation.dart';
-import 'package:quantus_sdk/quantus_sdk.dart'; // For debugPrint
+import 'package:quantus_sdk/quantus_sdk.dart';
 
 class NumberFormattingService {
   static const int decimals = AppConstants.decimals;
   static final BigInt scaleFactorBigInt = BigInt.from(10).pow(decimals);
   static final Decimal scaleFactorDecimal = Decimal.fromBigInt(scaleFactorBigInt);
 
+  final LocaleNumberConfig _localeConfig;
+
+  NumberFormattingService({required LocaleNumberConfig localeConfig}) : _localeConfig = localeConfig;
+
   /// Formats a raw BigInt balance (representing the smallest unit) into a
   /// user-readable string with a specified number of decimal places.
   ///
-  /// Example: 1234500000000 -> "1.2345" (with maxDecimals = 4)
+  /// Example: 1234500000000 -> "1.2345" (with maxDecimals = 4, US locale)
+  /// Example: 1234500000000 -> "1,2345" (with maxDecimals = 4, Indonesian locale)
   String formatBalance(
     BigInt balance, {
     int maxDecimals = 4,
     bool addThousandsSeparators = true,
     bool addSymbol = false,
   }) {
+    String resultString = '0';
+
     if (balance == BigInt.zero) {
-      return '0';
+      return addSymbol ? '$resultString ${AppConstants.tokenSymbol}' : resultString;
     }
 
-    // 1. Perform division to get the precise decimal value.
     final decimalBalance = (Decimal.fromBigInt(balance) / scaleFactorDecimal).toDecimal(
-      scaleOnInfinitePrecision:
-          maxDecimals * 3, // Note: We never have an infinite number of decimals because we divide by powers of 10.
+      scaleOnInfinitePrecision: maxDecimals * 3,
     );
 
-    // 2. Convert to a string for manipulation.
     String asString = decimalBalance.toString();
 
-    // 3. Manually truncate the string representation.
     final dotIndex = asString.indexOf('.');
     if (dotIndex != -1) {
-      // Check if there are enough characters after the dot.
       if (asString.length > dotIndex + maxDecimals + 1) {
         asString = asString.substring(0, dotIndex + maxDecimals + 1);
       }
     }
 
-    // 4. Remove any trailing zeros from the fractional part for a clean look.
     if (asString.contains('.')) {
       asString = asString.replaceAll(RegExp(r'0+$'), '');
-      // If we're left with a trailing dot, remove it.
       if (asString.endsWith('.')) {
         asString = asString.substring(0, asString.length - 1);
       }
     }
 
-    String resultString = asString;
-
-    if (addThousandsSeparators) {
-      // 5. Manually add thousand separators to the integer part.
-      final parts = asString.split('.');
-      final integerPart = parts[0];
-      final decimalPart = parts.length > 1 ? '.${parts[1]}' : '';
-
-      final formattedInteger = integerPart.replaceAllMapped(
-        RegExp(r'(\d{1,3})(?=(\d{3})+(?!\d))'),
-        (Match m) => '${m[1]},',
-      );
-      resultString = formattedInteger + decimalPart;
-    }
+    resultString = asString;
+    resultString = _localeConfig.localize(resultString, addGroupingSeparators: addThousandsSeparators);
 
     if (addSymbol) {
       resultString = '$resultString ${AppConstants.tokenSymbol}';
@@ -70,30 +57,25 @@ class NumberFormattingService {
     return resultString;
   }
 
-  /// Parses a user-entered formatted string amount (e.g., "1.23" or "1,23"
-  /// depends on localization) into a raw BigInt amount scaled
-  /// by the chain's decimals.
+  /// Parses a user-entered formatted string amount into a raw BigInt amount
+  /// scaled by the chain's decimals.
   ///
-  /// Returns null if the input string is invalid.
+  /// The input is interpreted using the [LocaleNumberConfig] supplied at
+  /// construction (decimal/grouping separators come from the user's locale).
+  /// Returns [BigInt.zero] for an empty string and `null` for unparseable input.
   BigInt? parseAmount(String formattedAmount) {
     if (formattedAmount.isEmpty) {
       return BigInt.zero;
     }
 
     try {
-      final sanitizedText = formattedAmount.replaceAll(',', '.');
-
-      final decimalAmount = Decimal.parse(sanitizedText);
-      // Check if input precision exceeds chain precision
+      final decimalAmount = _localeConfig.parseDecimal(formattedAmount);
       if (decimalAmount.scale > decimals) {
-        // Option 1: Truncate (like toBigInt does)
-        // Option 2: Throw an error - let's stick with truncation for now
         debugPrint('Warning: Input amount $formattedAmount exceeds $decimals decimals, will be truncated.');
       }
       final rawDecimalAmount = decimalAmount * scaleFactorDecimal;
-      return rawDecimalAmount.toBigInt(); // toBigInt truncates
+      return rawDecimalAmount.toBigInt();
     } catch (e) {
-      // Correct debugPrint usage
       debugPrint('Error parsing amount $formattedAmount: $e');
       return null;
     }
diff --git a/quantus_sdk/lib/src/services/settings_service.dart b/quantus_sdk/lib/src/services/settings_service.dart
index 91a27edd8..fdf33e7a1 100644
--- a/quantus_sdk/lib/src/services/settings_service.dart
+++ b/quantus_sdk/lib/src/services/settings_service.dart
@@ -26,6 +26,8 @@ class SettingsService {
   static const String _activeAccountIdKey = 'active_account_id';
   static const String _activeDisplayAccountKey = 'active_display_account';
   static const String _balanceHiddenKey = 'balance_hidden';
+  static const String _currencyFlippedKey = 'currency_flipped';
+  static const String _selectedFiatCurrencyKey = 'selected_fiat_currency';
 
   static const String _lastPausedTimeKey = 'last_paused_time';
 
@@ -292,6 +294,26 @@ class SettingsService {
     return _prefs.getBool(_balanceHiddenKey) ?? false;
   }
 
+  // Currency Flip Settings (whether fiat is shown as the primary display)
+  Future<void> setCurrencyFlipped(bool flipped) async {
+    await _prefs.setBool(_currencyFlippedKey, flipped);
+  }
+
+  bool isCurrencyFlipped() {
+    return _prefs.getBool(_currencyFlippedKey) ?? false;
+  }
+
+  // Selected Fiat Currency Settings
+  Future<void> setSelectedFiatCurrency(String currencyCode) async {
+    await _prefs.setString(_selectedFiatCurrencyKey, currencyCode);
+  }
+
+  /// Returns the persisted fiat currency code (e.g. "USD"), or null when no
+  /// preference has been saved yet (caller should fall back to the default).
+  String? getSelectedFiatCurrency() {
+    return _prefs.getString(_selectedFiatCurrencyKey);
+  }
+
   // POS Mode Settings
   static const String _posModeEnabledKey = 'pos_mode_enabled';
 
diff --git a/quantus_sdk/lib/src/services/taskmaster_service.dart b/quantus_sdk/lib/src/services/taskmaster_service.dart
index 834f14700..1331c4748 100644
--- a/quantus_sdk/lib/src/services/taskmaster_service.dart
+++ b/quantus_sdk/lib/src/services/taskmaster_service.dart
@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:convert/convert.dart' as convert_hex;
 import 'package:http/http.dart' as http;
 import 'package:quantus_sdk/quantus_sdk.dart';
+import 'package:quantus_sdk/src/models/exchange_rates_result.dart';
 import 'package:quantus_sdk/src/models/oauth_link.dart';
 import 'package:quantus_sdk/src/rust/api/crypto.dart' as crypto;
 
@@ -130,7 +131,8 @@ class TaskmasterService {
   final _referralEndpoint = Uri.parse('${AppConstants.taskMasterEndpoint}/referrals');
   final _ethAssociationsEndpoint = Uri.parse('${AppConstants.taskMasterEndpoint}/addresses/associations/eth');
   final _xAssociationsEndpoint = Uri.parse('${AppConstants.taskMasterEndpoint}/addresses/associations/x');
-  final remoteConfigsEndpoint = Uri.parse('${AppConstants.taskMasterEndpoint}/configs/wallet');
+  final _remoteConfigsEndpoint = Uri.parse('${AppConstants.taskMasterEndpoint}/configs/wallet');
+  final _exchangeRatesEndpoint = Uri.parse('${AppConstants.taskMasterEndpoint}/exchange-rates');
 
   final String _minerStatsQuery = r'''
     query MinerStats($ids: [String!]!) {
@@ -504,7 +506,10 @@ class TaskmasterService {
   }
 
   Future<RemoteConfigModel> getRemoteConfig() async {
-    final http.Response response = await http.get(remoteConfigsEndpoint, headers: {'Content-Type': 'application/json'});
+    final http.Response response = await http.get(
+      _remoteConfigsEndpoint,
+      headers: {'Content-Type': 'application/json'},
+    );
     if (response.statusCode != 200) {
       throw Exception('Configs request failed with status: ${response.statusCode}. Body: ${response.body}');
     }
@@ -519,6 +524,25 @@ class TaskmasterService {
     return RemoteConfigModel.fromJson(data);
   }
 
+  Future<ExchangeRatesResult> getExchangeRates() async {
+    final http.Response response = await http.get(
+      _exchangeRatesEndpoint,
+      headers: {'Content-Type': 'application/json'},
+    );
+    if (response.statusCode != 200) {
+      throw Exception('Exchange rates request failed with status: ${response.statusCode}. Body: ${response.body}');
+    }
+
+    final Map<String, dynamic>? responseBody = jsonDecode(response.body);
+    final Map<String, dynamic>? data = responseBody?['data'];
+
+    if (data == null) {
+      throw Exception('Exchange rates not found!');
+    }
+
+    return ExchangeRatesResult.fromJson(data);
+  }
+
   Future<MinerStats> getMinerStats() async {
     final miningAccountId = await getMiningAccountId();
     final List<String> accountIds = [miningAccountId];
diff --git a/quantus_sdk/pubspec.lock b/quantus_sdk/pubspec.lock
index cbaf05d6d..6d1273dd8 100644
--- a/quantus_sdk/pubspec.lock
+++ b/quantus_sdk/pubspec.lock
@@ -406,8 +406,8 @@ packages:
     dependency: "direct main"
     description:
       path: dart
-      ref: "v2.0.1"
-      resolved-ref: "57ac13fd7f92afe8e89da30b94fc69fd68125f6f"
+      ref: "v2.2.0"
+      resolved-ref: cd1beb73c12e574dc6f6ac9a4cd6896d3603b62b
       url: "https://github.com/Quantus-Network/qp-human-checkphrase.git"
     source: git
     version: "0.1.0"
diff --git a/quantus_sdk/pubspec.yaml b/quantus_sdk/pubspec.yaml
index 2279481a6..549b86876 100644
--- a/quantus_sdk/pubspec.yaml
+++ b/quantus_sdk/pubspec.yaml
@@ -46,7 +46,7 @@ dependencies:
   human_checksum:
     git:
       url: https://github.com/Quantus-Network/qp-human-checkphrase.git
-      ref: v2.0.1
+      ref: v2.2.0
       path: dart
 
 # Generate Polkadart bindings