diff --git a/app/src/main/java/to/bitkit/ui/ContentView.kt b/app/src/main/java/to/bitkit/ui/ContentView.kt
index ea772dcf1..873ef5a77 100644
--- a/app/src/main/java/to/bitkit/ui/ContentView.kt
+++ b/app/src/main/java/to/bitkit/ui/ContentView.kt
@@ -561,7 +561,6 @@ private fun RootNavHost(
                         navController.navigateToTransferFunding()
                         settingsViewModel.setHasSeenTransferIntro(true)
                     },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             composableWithDefaultTransitions<Routes.SavingsIntro> {
@@ -571,7 +570,6 @@ private fun RootNavHost(
                         settingsViewModel.setHasSeenSavingsIntro(true)
                     },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             composableWithDefaultTransitions<Routes.SavingsAvailability> {
@@ -586,14 +584,12 @@ private fun RootNavHost(
                     onConfirm = { navController.navigate(Routes.SavingsProgress) },
                     onAdvancedClick = { navController.navigate(Routes.SavingsAdvanced) },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             composableWithDefaultTransitions<Routes.SavingsAdvanced> {
                 SavingsAdvancedScreen(
                     onContinueClick = { navController.popBackStack<Routes.SavingsConfirm>(inclusive = false) },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             composableWithDefaultTransitions<Routes.SavingsProgress> {
@@ -602,7 +598,6 @@ private fun RootNavHost(
                     wallet = walletViewModel,
                     transfer = transferViewModel,
                     onContinueClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
-                    onCloseClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
                 )
             }
             composableWithDefaultTransitions<Routes.SpendingIntro> {
@@ -612,14 +607,12 @@ private fun RootNavHost(
                         settingsViewModel.setHasSeenSpendingIntro(true)
                     },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             composableWithDefaultTransitions<Routes.SpendingAmount> {
                 SpendingAmountScreen(
                     viewModel = transferViewModel,
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                     onOrderCreated = { navController.navigate(Routes.SpendingConfirm) },
                     toastException = { appViewModel.toast(it) },
                     toast = { title, description ->
@@ -651,7 +644,6 @@ private fun RootNavHost(
             composableWithDefaultTransitions<Routes.TransferLiquidity> {
                 LiquidityScreen(
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                     onContinueClick = { navController.popBackStack() }
                 )
             }
@@ -683,7 +675,6 @@ private fun RootNavHost(
                     },
                     onAdvanced = { navController.navigate(Routes.FundingAdvanced) },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                     isGeoBlocked = isGeoBlocked,
                 )
             }
@@ -692,7 +683,6 @@ private fun RootNavHost(
                     onLnurl = { navController.navigateToScanner() },
                     onManual = { navController.navigate(Routes.ExternalNav) },
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                 )
             }
             navigationWithDefaultTransitions<Routes.ExternalNav>(
@@ -710,7 +700,6 @@ private fun RootNavHost(
                         onNodeConnected = { navController.navigate(Routes.ExternalAmount) },
                         onScanClick = { navController.navigateToScanner(isCalledForResult = true) },
                         onBackClick = { navController.popBackStack() },
-                        onCloseClick = { navController.navigateToHome() },
                     )
                 }
                 composableWithDefaultTransitions<Routes.ExternalAmount> {
@@ -721,7 +710,6 @@ private fun RootNavHost(
                         viewModel = viewModel,
                         onContinue = { navController.navigate(Routes.ExternalConfirm) },
                         onBackClick = { navController.popBackStack() },
-                        onCloseClick = { navController.navigateToHome() },
                     )
                 }
                 composableWithDefaultTransitions<Routes.ExternalConfirm> {
@@ -736,7 +724,6 @@ private fun RootNavHost(
                         },
                         onNetworkFeeClick = { navController.navigate(Routes.ExternalFeeCustom) },
                         onBackClick = { navController.popBackStack() },
-                        onCloseClick = { navController.navigateToHome() },
                     )
                 }
                 composableWithDefaultTransitions<Routes.LnurlChannel> {
@@ -837,7 +824,6 @@ private fun NavGraphBuilder.settings(
     composableWithDefaultTransitions<Routes.LanguageSettings> {
         LanguageSettingsScreen(
             onBackClick = { navController.popBackStack() },
-            onCloseClick = { navController.navigateToHome() },
         )
     }
 }
@@ -1125,7 +1111,6 @@ private fun NavGraphBuilder.activityItem(
             listViewModel = activityListViewModel,
             route = it.toRoute(),
             onBackClick = { navController.popBackStack() },
-            onCloseClick = { navController.navigateToHome() },
         )
     }
 }
@@ -1359,7 +1344,6 @@ private fun NavGraphBuilder.widgets(
 
             BlocksEditScreen(
                 blocksViewModel = viewModel,
-                onClose = { navController.navigateToHome() },
                 onBack = { navController.popBackStack() },
                 navigatePreview = { navController.navigate(Routes.BlocksPreview) }
             )
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/FundingAdvancedScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/FundingAdvancedScreen.kt
index 4c9d7d07f..6eb6dd8db 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/FundingAdvancedScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/FundingAdvancedScreen.kt
@@ -31,7 +31,6 @@ fun FundingAdvancedScreen(
     onLnurl: () -> Unit = {},
     onManual: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     ScreenColumn {
         AppTopBar(
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/FundingScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/FundingScreen.kt
index cb5d441a5..d72d99552 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/FundingScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/FundingScreen.kt
@@ -46,7 +46,6 @@ fun FundingScreen(
     onFund: () -> Unit = {},
     onAdvanced: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val balances = LocalBalances.current
     val canTransfer = remember(balances.totalOnchainSats) {
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/LiquidityScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/LiquidityScreen.kt
index ee7635d6f..42c106330 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/LiquidityScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/LiquidityScreen.kt
@@ -32,7 +32,6 @@ import to.bitkit.ui.utils.withAccent
 fun LiquidityScreen(
     onContinueClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val transfer = transferViewModel ?: return
     val state by transfer.spendingUiState.collectAsStateWithLifecycle()
@@ -47,7 +46,6 @@ fun LiquidityScreen(
         localBalance = localBalance,
         remoteBalance = remoteBalance,
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
         onContinueClick = onContinueClick,
     )
 }
@@ -58,7 +56,6 @@ private fun LiquidityScreen(
     localBalance: Long,
     remoteBalance: Long,
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
     onContinueClick: () -> Unit = {},
 ) {
     ScreenColumn {
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsAdvancedScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsAdvancedScreen.kt
index 120575491..ef77ad01d 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsAdvancedScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsAdvancedScreen.kt
@@ -48,7 +48,6 @@ import to.bitkit.ui.walletViewModel
 fun SavingsAdvancedScreen(
     onContinueClick: () -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     val currency = currencyViewModel ?: return
     val wallet = walletViewModel ?: return
@@ -93,7 +92,6 @@ fun SavingsAdvancedScreen(
             onContinueClick()
         },
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
     )
 }
 
@@ -104,7 +102,6 @@ private fun SavingsAdvancedContent(
     onAmountClick: () -> Unit = {},
     onContinueClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val totalAmount = channelItems.filter { it.isSelected }.sumOf { it.balance }
 
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsConfirmScreen.kt
index 9d834591b..4aeeac17a 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsConfirmScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsConfirmScreen.kt
@@ -49,7 +49,6 @@ fun SavingsConfirmScreen(
     onConfirm: () -> Unit,
     onAdvancedClick: () -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     val currency = currencyViewModel ?: return
     val transfer = transferViewModel ?: return
@@ -76,7 +75,6 @@ fun SavingsConfirmScreen(
         hasMultiple = hasMultiple,
         hasSelected = hasSelected,
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
         onAmountClick = { currency.switchUnit() },
         onAdvancedClick = onAdvancedClick,
         onSelectAllClick = { transfer.setSelectedChannelIds(emptySet()) },
@@ -93,7 +91,6 @@ private fun SavingsConfirmContent(
     hasMultiple: Boolean,
     hasSelected: Boolean,
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
     onAmountClick: () -> Unit = {},
     onAdvancedClick: () -> Unit = {},
     onSelectAllClick: () -> Unit = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsIntroScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsIntroScreen.kt
index ed0e5eb0b..bfe16c7d1 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsIntroScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsIntroScreen.kt
@@ -32,7 +32,6 @@ import to.bitkit.ui.utils.withAccent
 fun SavingsIntroScreen(
     onContinueClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     Box(
         contentAlignment = Alignment.TopCenter,
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsProgressScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsProgressScreen.kt
index 0267b08d1..c67e05c49 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsProgressScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/SavingsProgressScreen.kt
@@ -52,7 +52,6 @@ fun SavingsProgressScreen(
     transfer: TransferViewModel,
     wallet: WalletViewModel,
     onContinueClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val window = LocalActivity.current?.window
     var progressState by remember { mutableStateOf(SavingsProgressState.PROGRESS) }
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountScreen.kt
index c9d6a2822..6384a4880 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAmountScreen.kt
@@ -53,7 +53,6 @@ import kotlin.math.min
 fun SpendingAmountScreen(
     viewModel: TransferViewModel,
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
     onOrderCreated: () -> Unit = {},
     toastException: (Throwable) -> Unit,
     toast: (title: String, description: String) -> Unit,
@@ -85,7 +84,6 @@ fun SpendingAmountScreen(
         amountInputViewModel = amountInputViewModel,
         currencies = currencies,
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
         onClickQuarter = {
             val quarter = uiState.balanceAfterFeeQuarter()
             val max = uiState.maxAllowedToSend
@@ -116,7 +114,6 @@ private fun Content(
     uiState: TransferToSpendingUiState,
     amountInputViewModel: AmountInputViewModel,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
     onClickQuarter: () -> Unit,
     onClickMaxAmount: () -> Unit,
     onConfirmAmount: () -> Unit,
@@ -254,7 +251,6 @@ private fun Preview() {
             amountInputViewModel = previewAmountInputViewModel(),
             currencies = CurrencyState(),
             onBackClick = {},
-            onCloseClick = {},
             onClickQuarter = {},
             onClickMaxAmount = {},
             onConfirmAmount = {},
@@ -272,7 +268,6 @@ private fun PreviewInitializing() {
             amountInputViewModel = previewAmountInputViewModel(),
             currencies = CurrencyState(),
             onBackClick = {},
-            onCloseClick = {},
             onClickQuarter = {},
             onClickMaxAmount = {},
             onConfirmAmount = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingConfirmScreen.kt
index b4aa061b7..0432775b9 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingConfirmScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingConfirmScreen.kt
@@ -96,7 +96,6 @@ fun SpendingConfirmScreen(
 
     Content(
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
         onLearnMoreClick = onLearnMoreClick,
         onAdvancedClick = onAdvancedClick,
         onConfirm = onConfirm,
@@ -114,7 +113,6 @@ fun SpendingConfirmScreen(
 @Composable
 private fun Content(
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
     onLearnMoreClick: () -> Unit,
     onAdvancedClick: () -> Unit,
     onConfirm: () -> Unit,
@@ -273,7 +271,6 @@ private fun Preview() {
     AppThemeSurface {
         Content(
             onBackClick = {},
-            onCloseClick = {},
             onLearnMoreClick = {},
             onAdvancedClick = {},
             onConfirm = {},
@@ -351,7 +348,6 @@ private fun Preview2() {
     AppThemeSurface {
         Content(
             onBackClick = {},
-            onCloseClick = {},
             onLearnMoreClick = {},
             onAdvancedClick = {},
             onConfirm = {},
@@ -429,7 +425,6 @@ private fun Preview3() {
     AppThemeSurface {
         Content(
             onBackClick = {},
-            onCloseClick = {},
             onLearnMoreClick = {},
             onAdvancedClick = {},
             onConfirm = {},
@@ -507,7 +502,6 @@ private fun Preview4() {
     AppThemeSurface {
         Content(
             onBackClick = {},
-            onCloseClick = {},
             onLearnMoreClick = {},
             onAdvancedClick = {},
             onConfirm = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingIntroScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingIntroScreen.kt
index 03f51f791..7a94031b4 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingIntroScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingIntroScreen.kt
@@ -31,7 +31,6 @@ import to.bitkit.ui.utils.withAccent
 fun SpendingIntroScreen(
     onContinueClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     Box(
         contentAlignment = Alignment.TopCenter,
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/TransferIntroScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/TransferIntroScreen.kt
index ebc83972d..2c0c514f0 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/TransferIntroScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/TransferIntroScreen.kt
@@ -33,7 +33,6 @@ import to.bitkit.ui.utils.withAccent
 @Composable
 fun TransferIntroScreen(
     onContinueClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     Box(
         contentAlignment = Alignment.TopCenter,
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalAmountScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalAmountScreen.kt
index 8bcc947b1..cd321f96c 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalAmountScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalAmountScreen.kt
@@ -53,7 +53,6 @@ fun ExternalAmountScreen(
     viewModel: ExternalNodeViewModel,
     onContinue: () -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
     amountInputViewModel: AmountInputViewModel = hiltViewModel(),
     currencies: CurrencyState = LocalCurrencies.current,
 ) {
@@ -73,7 +72,6 @@ fun ExternalAmountScreen(
             onContinue()
         },
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
     )
 }
 
@@ -85,7 +83,6 @@ private fun Content(
     currencies: CurrencyState = LocalCurrencies.current,
     onContinueClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     ScreenColumn {
         AppTopBar(
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConfirmScreen.kt
index 0d21cea07..91f514e34 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConfirmScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConfirmScreen.kt
@@ -52,7 +52,6 @@ fun ExternalConfirmScreen(
     onConfirm: () -> Unit,
     onNetworkFeeClick: () -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     val uiState by viewModel.uiState.collectAsState()
 
@@ -70,7 +69,6 @@ fun ExternalConfirmScreen(
         onConfirm = { viewModel.onConfirm() },
         onNetworkFeeClick = onNetworkFeeClick,
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
     )
 }
 
@@ -80,7 +78,6 @@ private fun Content(
     onConfirm: () -> Unit = {},
     onNetworkFeeClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     ScreenColumn {
         AppTopBar(
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConnectionScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConnectionScreen.kt
index 1c7e1cb50..5d45f2430 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConnectionScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalConnectionScreen.kt
@@ -64,7 +64,6 @@ fun ExternalConnectionScreen(
     onNodeConnected: () -> Unit,
     onScanClick: () -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     val context = LocalContext.current
     val uiState by viewModel.uiState.collectAsState()
@@ -101,7 +100,6 @@ fun ExternalConnectionScreen(
         onPasteClick = { viewModel.parseNodeUri(context.getClipboardText().orEmpty()) },
         onScanClick = onScanClick,
         onBackClick = onBackClick,
-        onCloseClick = onCloseClick,
     )
 }
 
@@ -112,7 +110,6 @@ private fun ExternalConnectionContent(
     onScanClick: () -> Unit = {},
     onPasteClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     var nodeId by remember(uiState.peer) { mutableStateOf(uiState.peer?.nodeId.orEmpty()) }
     var host by remember(uiState.peer) { mutableStateOf(uiState.peer?.host.orEmpty()) }
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt
index 371f81aed..9f9e03e70 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt
@@ -71,7 +71,6 @@ fun ActivityExploreScreen(
     detailViewModel: ActivityDetailViewModel = hiltViewModel(),
     route: Routes.ActivityExplore,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     val activities by listViewModel.filteredActivities.collectAsStateWithLifecycle()
     val item = activities?.find { it.rawId() == route.id } ?: return
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityIcon.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityIcon.kt
index 60a1bb980..46424ae60 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityIcon.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityIcon.kt
@@ -35,8 +35,8 @@ import to.bitkit.ui.theme.Colors
 @Composable
 fun ActivityIcon(
     activity: Activity,
-    size: Dp = 32.dp,
     modifier: Modifier = Modifier,
+    size: Dp = 32.dp,
 ) {
     val isLightning = activity is Activity.Lightning
     val status: PaymentState? = when (activity) {
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreen.kt
index f551016b7..2c4a086d5 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreen.kt
@@ -39,7 +39,6 @@ import to.bitkit.ui.theme.Colors
 @Composable
 fun BlocksEditScreen(
     blocksViewModel: BlocksViewModel,
-    onClose: () -> Unit,
     onBack: () -> Unit,
     navigatePreview: () -> Unit,
 ) {
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksPreviewScreen.kt
index ce6f4308d..dcba3cb0c 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksPreviewScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlocksPreviewScreen.kt
@@ -52,7 +52,6 @@ fun BlocksPreviewScreen(
     val isBlocksWidgetEnabled by blocksViewModel.isBlocksWidgetEnabled.collectAsStateWithLifecycle()
 
     BlocksPreviewContent(
-        onClose = onClose,
         onBack = onBack,
         isBlocksWidgetEnabled = isBlocksWidgetEnabled,
         blocksPreferences = customBlocksPreferences,
@@ -72,7 +71,6 @@ fun BlocksPreviewScreen(
 
 @Composable
 fun BlocksPreviewContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     onClickEdit: () -> Unit,
     onClickDelete: () -> Unit,
@@ -213,7 +211,6 @@ fun BlocksPreviewContent(
 private fun Preview() {
     AppThemeSurface {
         BlocksPreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = true,
             onClickEdit = {},
@@ -238,7 +235,6 @@ private fun Preview() {
 private fun Preview2() {
     AppThemeSurface {
         BlocksPreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = false,
             onClickEdit = {},
diff --git a/app/src/main/java/to/bitkit/ui/settings/BlocktankRegtestScreen.kt b/app/src/main/java/to/bitkit/ui/settings/BlocktankRegtestScreen.kt
index c16bd4e42..00c7489d4 100644
--- a/app/src/main/java/to/bitkit/ui/settings/BlocktankRegtestScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/BlocktankRegtestScreen.kt
@@ -35,7 +35,6 @@ import to.bitkit.ui.components.Caption
 import to.bitkit.ui.components.Caption13Up
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.VerticalSpacer
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
diff --git a/app/src/main/java/to/bitkit/ui/settings/LanguageSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/LanguageSettingsScreen.kt
index f8a7b7a35..bc011093a 100644
--- a/app/src/main/java/to/bitkit/ui/settings/LanguageSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/LanguageSettingsScreen.kt
@@ -27,7 +27,6 @@ import to.bitkit.viewmodels.LanguageViewModel
 @Composable
 fun LanguageSettingsScreen(
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
     modifier: Modifier = Modifier,
     viewmodel: LanguageViewModel = hiltViewModel(),
 ) {
@@ -37,7 +36,6 @@ fun LanguageSettingsScreen(
 
     Content(
         uiState = uiState,
-        onCloseClick = onCloseClick,
         onBackClick = onBackClick,
         onClickLanguage = { selectedLanguage -> viewmodel.selectLanguage(selectedLanguage) },
         modifier = modifier,
@@ -48,7 +46,6 @@ fun LanguageSettingsScreen(
 private fun Content(
     uiState: LanguageUiState,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
     onClickLanguage: (Language) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -90,7 +87,6 @@ private fun Preview() {
                 languages = Language.entries
             ),
             onBackClick = {},
-            onCloseClick = {},
             onClickLanguage = {},
         )
     }
diff --git a/app/src/main/java/to/bitkit/ui/settings/SecuritySettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/SecuritySettingsScreen.kt
index 66a8ef7ad..5ca72a89f 100644
--- a/app/src/main/java/to/bitkit/ui/settings/SecuritySettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/SecuritySettingsScreen.kt
@@ -24,7 +24,6 @@ import to.bitkit.ui.components.settings.SettingsSwitchRow
 import to.bitkit.ui.navigateToAuthCheck
 import to.bitkit.ui.navigateToChangePin
 import to.bitkit.ui.navigateToDisablePin
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -105,7 +104,6 @@ fun SecuritySettingsScreen(
             settings.setEnableSendAmountWarning(!enableSendAmountWarning)
         },
         onBackClick = { navController.popBackStack() },
-        onCloseClick = { navController.navigateToHome() },
     )
 }
 
@@ -132,7 +130,6 @@ private fun Content(
     onAutoReadClipboardClick: () -> Unit = {},
     onSendAmountWarningClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     ScreenColumn(
         modifier = Modifier
diff --git a/app/src/main/java/to/bitkit/ui/settings/advanced/AddressViewerScreen.kt b/app/src/main/java/to/bitkit/ui/settings/advanced/AddressViewerScreen.kt
index 91cf39b04..deb9dd4fa 100644
--- a/app/src/main/java/to/bitkit/ui/settings/advanced/AddressViewerScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/advanced/AddressViewerScreen.kt
@@ -42,7 +42,6 @@ import to.bitkit.ui.components.QrCodeImage
 import to.bitkit.ui.components.SearchInput
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.VerticalSpacer
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
diff --git a/app/src/main/java/to/bitkit/ui/settings/advanced/CoinSelectPreferenceScreen.kt b/app/src/main/java/to/bitkit/ui/settings/advanced/CoinSelectPreferenceScreen.kt
index 19fac051f..c51cf5e34 100644
--- a/app/src/main/java/to/bitkit/ui/settings/advanced/CoinSelectPreferenceScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/advanced/CoinSelectPreferenceScreen.kt
@@ -20,7 +20,6 @@ import to.bitkit.models.CoinSelectionPreference
 import to.bitkit.ui.components.settings.SectionHeader
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
diff --git a/app/src/main/java/to/bitkit/ui/settings/appStatus/AppStatusScreen.kt b/app/src/main/java/to/bitkit/ui/settings/appStatus/AppStatusScreen.kt
index e402eefcf..f0a404409 100644
--- a/app/src/main/java/to/bitkit/ui/settings/appStatus/AppStatusScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/appStatus/AppStatusScreen.kt
@@ -39,7 +39,6 @@ import to.bitkit.ui.components.BodyMSB
 import to.bitkit.ui.components.CaptionB
 import to.bitkit.ui.components.HorizontalSpacer
 import to.bitkit.ui.components.VerticalSpacer
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
diff --git a/app/src/main/java/to/bitkit/ui/settings/general/DefaultUnitSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/general/DefaultUnitSettingsScreen.kt
index 1c5eae96d..623984f03 100644
--- a/app/src/main/java/to/bitkit/ui/settings/general/DefaultUnitSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/general/DefaultUnitSettingsScreen.kt
@@ -21,7 +21,6 @@ import to.bitkit.ui.components.settings.SectionFooter
 import to.bitkit.ui.components.settings.SectionHeader
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -42,7 +41,6 @@ fun DefaultUnitSettingsScreen(
         onPrimaryUnitClick = currencyViewModel::setPrimaryDisplayUnit,
         onBitcoinUnitClick = currencyViewModel::setBtcDisplayUnit,
         onBackClick = { navController.popBackStack() },
-        onCloseClick = navController::navigateToHome,
     )
 }
 
@@ -54,7 +52,6 @@ fun DefaultUnitSettingsScreenContent(
     onPrimaryUnitClick: (PrimaryDisplay) -> Unit,
     onBitcoinUnitClick: (BitcoinDisplayUnit) -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
@@ -121,7 +118,6 @@ private fun Preview() {
             onPrimaryUnitClick = {},
             onBitcoinUnitClick = {},
             onBackClick = {},
-            onCloseClick = {},
         )
     }
 }
diff --git a/app/src/main/java/to/bitkit/ui/settings/general/GeneralSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/general/GeneralSettingsScreen.kt
index f373a7bde..f90906e27 100644
--- a/app/src/main/java/to/bitkit/ui/settings/general/GeneralSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/general/GeneralSettingsScreen.kt
@@ -25,7 +25,6 @@ import to.bitkit.ui.Routes
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
 import to.bitkit.ui.navigateToDefaultUnitSettings
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.navigateToLanguageSettings
 import to.bitkit.ui.navigateToLocalCurrencySettings
 import to.bitkit.ui.navigateToQuickPaySettings
@@ -61,7 +60,6 @@ fun GeneralSettingsScreen(
         defaultTransactionSpeed = defaultTransactionSpeed,
         showTagsButton = lastUsedTags.isNotEmpty(),
         onBackClick = { navController.popBackStack() },
-        onCloseClick = { navController.navigateToHome() },
         onLocalCurrencyClick = { navController.navigateToLocalCurrencySettings() },
         onDefaultUnitClick = { navController.navigateToDefaultUnitSettings() },
         onTransactionSpeedClick = { navController.navigateToTransactionSpeedSettings() },
@@ -90,7 +88,6 @@ private fun GeneralSettingsContent(
     notificationsGranted: Boolean,
     showTagsButton: Boolean = false,
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
     onLocalCurrencyClick: () -> Unit = {},
     onDefaultUnitClick: () -> Unit = {},
     onTransactionSpeedClick: () -> Unit = {},
diff --git a/app/src/main/java/to/bitkit/ui/settings/general/TagsSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/general/TagsSettingsScreen.kt
index 13686db0f..2006e8f39 100644
--- a/app/src/main/java/to/bitkit/ui/settings/general/TagsSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/general/TagsSettingsScreen.kt
@@ -17,7 +17,6 @@ import androidx.navigation.NavController
 import to.bitkit.R
 import to.bitkit.ui.components.TagButton
 import to.bitkit.ui.components.settings.SectionHeader
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -41,7 +40,6 @@ fun TagsSettingsScreen(
             }
         },
         onBackClick = { navController.popBackStack() },
-        onCloseClick = { navController.navigateToHome() },
     )
 }
 
@@ -50,7 +48,6 @@ private fun TagsSettingsContent(
     tags: List<String>,
     onClickTag: (String) -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     ScreenColumn {
         AppTopBar(
diff --git a/app/src/main/java/to/bitkit/ui/settings/general/WidgetsSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/general/WidgetsSettingsScreen.kt
index 249b628d8..9a860baa4 100644
--- a/app/src/main/java/to/bitkit/ui/settings/general/WidgetsSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/general/WidgetsSettingsScreen.kt
@@ -12,7 +12,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import to.bitkit.R
 import to.bitkit.ui.components.settings.SettingsSwitchRow
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -30,7 +29,6 @@ fun WidgetsSettingsScreen(
 
     WidgetsSettingsContent(
         onBackClick = { navController.popBackStack() },
-        onCloseClick = { navController.navigateToHome() },
         showWidgets = showWidgets,
         showWidgetTitles = showWidgetTitles,
         onShowWidgetsClick = { settings.setShowWidgets(!showWidgets) },
@@ -41,7 +39,6 @@ fun WidgetsSettingsScreen(
 @Composable
 private fun WidgetsSettingsContent(
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
     showWidgets: Boolean,
     onShowWidgetsClick: () -> Unit = {},
     showWidgetTitles: Boolean,
diff --git a/app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt b/app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt
index b01c81020..e033af786 100644
--- a/app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailScreen.kt
@@ -67,7 +67,6 @@ import to.bitkit.ui.components.MoneyCaptionB
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.VerticalSpacer
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
diff --git a/app/src/main/java/to/bitkit/ui/settings/lightning/CloseConnectionScreen.kt b/app/src/main/java/to/bitkit/ui/settings/lightning/CloseConnectionScreen.kt
index bfe161274..f31de0ea5 100644
--- a/app/src/main/java/to/bitkit/ui/settings/lightning/CloseConnectionScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/lightning/CloseConnectionScreen.kt
@@ -29,7 +29,6 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.VerticalSpacer
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -59,7 +58,6 @@ fun CloseConnectionScreen(
     Content(
         isLoading = uiState.isLoading,
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
         onClickClose = { viewModel.closeChannel() },
     )
 }
@@ -68,7 +66,6 @@ fun CloseConnectionScreen(
 private fun Content(
     isLoading: Boolean = false,
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
     onClickClose: () -> Unit = {},
 ) {
     ScreenColumn {
diff --git a/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinConfirmScreen.kt b/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinConfirmScreen.kt
index 68da176b9..99934e17f 100644
--- a/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinConfirmScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinConfirmScreen.kt
@@ -31,7 +31,6 @@ import to.bitkit.ui.components.NumberPad
 import to.bitkit.ui.components.NumberPadType
 import to.bitkit.ui.components.PinDots
 import to.bitkit.ui.navigateToChangePinResult
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -73,7 +72,6 @@ fun ChangePinConfirmScreen(
             }
         },
         onBackClick = { navController.popBackStack() },
-        onCloseClick = { navController.navigateToHome() },
     )
 }
 
@@ -83,7 +81,6 @@ private fun ChangePinConfirmContent(
     showError: Boolean,
     onKeyPress: (String) -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     ScreenColumn(
         modifier = Modifier.testTag("ChangePIN2")
@@ -141,7 +138,6 @@ private fun Preview() {
             showError = false,
             onKeyPress = {},
             onBackClick = {},
-            onCloseClick = {},
         )
     }
 }
@@ -155,7 +151,6 @@ private fun PreviewRetry() {
             showError = true,
             onKeyPress = {},
             onBackClick = {},
-            onCloseClick = {},
         )
     }
 }
diff --git a/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinNewScreen.kt b/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinNewScreen.kt
index d8ac7179b..79e9620d9 100644
--- a/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinNewScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinNewScreen.kt
@@ -25,7 +25,6 @@ import to.bitkit.ui.components.NumberPad
 import to.bitkit.ui.components.NumberPadType
 import to.bitkit.ui.components.PinDots
 import to.bitkit.ui.navigateToChangePinConfirm
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -56,7 +55,6 @@ fun ChangePinNewScreen(
             }
         },
         onBackClick = { navController.popBackStack() },
-        onCloseClick = { navController.navigateToHome() },
     )
 }
 
@@ -65,7 +63,6 @@ private fun ChangePinNewContent(
     pin: String,
     onKeyPress: (String) -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     ScreenColumn(
         modifier = Modifier.testTag("ChangePIN2")
@@ -111,7 +108,6 @@ private fun Preview() {
             pin = "12",
             onKeyPress = {},
             onBackClick = {},
-            onCloseClick = {},
         )
     }
 }
diff --git a/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinScreen.kt b/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinScreen.kt
index 2baf17be5..4a199c10f 100644
--- a/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/pin/ChangePinScreen.kt
@@ -30,7 +30,6 @@ import to.bitkit.ui.components.NumberPad
 import to.bitkit.ui.components.NumberPadType
 import to.bitkit.ui.components.PinDots
 import to.bitkit.ui.navigateToChangePinNew
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -69,7 +68,6 @@ fun ChangePinScreen(
             }
         },
         onBackClick = { navController.popBackStack() },
-        onCloseClick = { navController.navigateToHome() },
         onClickForgotPin = { app.setShowForgotPin(true) },
     )
 }
@@ -80,7 +78,6 @@ private fun ChangePinContent(
     attemptsRemaining: Int,
     onKeyPress: (String) -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
     onClickForgotPin: () -> Unit,
 ) {
     val isLastAttempt = attemptsRemaining == 1
@@ -152,7 +149,6 @@ private fun Preview() {
             attemptsRemaining = 8,
             onKeyPress = {},
             onBackClick = {},
-            onCloseClick = {},
             onClickForgotPin = {},
         )
     }
@@ -167,7 +163,6 @@ private fun PreviewAttemptsRemaining() {
             attemptsRemaining = 5,
             onKeyPress = {},
             onBackClick = {},
-            onCloseClick = {},
             onClickForgotPin = {},
         )
     }
@@ -182,7 +177,6 @@ private fun PreviewAttemptsLast() {
             attemptsRemaining = 1,
             onKeyPress = {},
             onBackClick = {},
-            onCloseClick = {},
             onClickForgotPin = {},
         )
     }
diff --git a/app/src/main/java/to/bitkit/ui/settings/pin/DisablePinScreen.kt b/app/src/main/java/to/bitkit/ui/settings/pin/DisablePinScreen.kt
index e855beed0..0999d011d 100644
--- a/app/src/main/java/to/bitkit/ui/settings/pin/DisablePinScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/pin/DisablePinScreen.kt
@@ -24,7 +24,6 @@ import to.bitkit.ui.components.AuthCheckAction
 import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.navigateToAuthCheck
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -44,7 +43,6 @@ fun DisablePinScreen(
             )
         },
         onBackClick = { navController.popBackStack() },
-        onCloseClick = { navController.navigateToHome() },
     )
 }
 
@@ -52,7 +50,6 @@ fun DisablePinScreen(
 private fun DisablePinContent(
     onDisableClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     ScreenColumn {
         AppTopBar(
diff --git a/app/src/main/java/to/bitkit/ui/settings/support/SupportScreen.kt b/app/src/main/java/to/bitkit/ui/settings/support/SupportScreen.kt
index d82e48710..488c6a56a 100644
--- a/app/src/main/java/to/bitkit/ui/settings/support/SupportScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/support/SupportScreen.kt
@@ -23,7 +23,6 @@ import to.bitkit.ui.Routes
 import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.settings.Links
 import to.bitkit.ui.components.settings.SettingsButtonRow
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
diff --git a/app/src/main/java/to/bitkit/ui/settings/transactionSpeed/CustomFeeSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/transactionSpeed/CustomFeeSettingsScreen.kt
index 20d54bf5b..e5c2cd163 100644
--- a/app/src/main/java/to/bitkit/ui/settings/transactionSpeed/CustomFeeSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/transactionSpeed/CustomFeeSettingsScreen.kt
@@ -86,7 +86,6 @@ fun CustomFeeSettingsScreen(
             navController.popBackStack()
         },
         onBackClick = { navController.popBackStack() },
-        onCloseClick = { navController.popBackStack() },
     )
 }
 
@@ -97,7 +96,6 @@ private fun CustomFeeSettingsContent(
     onKeyPress: (String) -> Unit = {},
     onContinue: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val feeRate = input.toUIntOrNull() ?: 0u
     val isValid = feeRate != 0u
diff --git a/app/src/main/java/to/bitkit/ui/settings/transactionSpeed/TransactionSpeedSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/transactionSpeed/TransactionSpeedSettingsScreen.kt
index 7e166ab9f..35db5e680 100644
--- a/app/src/main/java/to/bitkit/ui/settings/transactionSpeed/TransactionSpeedSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/transactionSpeed/TransactionSpeedSettingsScreen.kt
@@ -18,7 +18,6 @@ import to.bitkit.ui.components.settings.SectionHeader
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
 import to.bitkit.ui.navigateToCustomFeeSettings
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -41,7 +40,6 @@ fun TransactionSpeedSettingsScreen(
         },
         onCustomFeeClick = { navController.navigateToCustomFeeSettings() },
         onBackClick = { navController.popBackStack() },
-        onCloseClick = { navController.navigateToHome() },
     )
 }
 
@@ -51,7 +49,6 @@ private fun TransactionSpeedSettingsContent(
     onSpeedSelected: (TransactionSpeed) -> Unit = {},
     onCustomFeeClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     ScreenColumn(
         modifier = Modifier.verticalScroll(rememberScrollState())