diff --git a/app/src/main/java/to/bitkit/ui/ContentView.kt b/app/src/main/java/to/bitkit/ui/ContentView.kt
index bfd4fe676..ea772dcf1 100644
--- a/app/src/main/java/to/bitkit/ui/ContentView.kt
+++ b/app/src/main/java/to/bitkit/ui/ContentView.kt
@@ -1,6 +1,13 @@
 package to.bitkit.ui
 
 import android.content.Intent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.DrawerState
+import androidx.compose.material3.DrawerValue
+import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
@@ -12,6 +19,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.net.toUri
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -26,8 +35,10 @@ import androidx.navigation.NavHostController
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
+import dev.chrisbanes.haze.rememberHazeState
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
@@ -38,8 +49,10 @@ import to.bitkit.models.Toast
 import to.bitkit.models.WidgetType
 import to.bitkit.ui.Routes.ExternalConnection
 import to.bitkit.ui.components.AuthCheckScreen
+import to.bitkit.ui.components.DrawerMenu
 import to.bitkit.ui.components.Sheet
 import to.bitkit.ui.components.SheetHost
+import to.bitkit.ui.components.TabBar
 import to.bitkit.ui.components.TimedSheetType
 import to.bitkit.ui.onboarding.InitializingWalletView
 import to.bitkit.ui.onboarding.WalletRestoreErrorView
@@ -80,6 +93,7 @@ import to.bitkit.ui.screens.transfer.external.LnurlChannelScreen
 import to.bitkit.ui.screens.wallets.HomeNav
 import to.bitkit.ui.screens.wallets.activity.ActivityDetailScreen
 import to.bitkit.ui.screens.wallets.activity.ActivityExploreScreen
+import to.bitkit.ui.screens.wallets.activity.AllActivityScreen
 import to.bitkit.ui.screens.wallets.activity.DateRangeSelectorSheet
 import to.bitkit.ui.screens.wallets.activity.TagSelectorSheet
 import to.bitkit.ui.screens.wallets.receive.ReceiveSheet
@@ -183,6 +197,7 @@ fun ContentView(
     backupsViewModel: BackupsViewModel,
 ) {
     val navController = rememberNavController()
+    val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
     val context = LocalContext.current
     val lifecycle = LocalLifecycleOwner.current.lifecycle
 
@@ -337,99 +352,142 @@ fun ContentView(
             LocalTransferViewModel provides transferViewModel,
             LocalSettingsViewModel provides settingsViewModel,
             LocalBackupsViewModel provides backupsViewModel,
+            LocalDrawerState provides drawerState,
             LocalBalances provides balance,
             LocalCurrencies provides currencies,
         ) {
             AutoReadClipboardHandler()
 
-            val currentSheet by appViewModel.currentSheet.collectAsStateWithLifecycle()
-            SheetHost(
-                shouldExpand = currentSheet != null,
-                onDismiss = { appViewModel.hideSheet() },
-                sheets = {
-                    when (val sheet = currentSheet) {
-                        null -> Unit
-                        is Sheet.Send -> {
-                            SendSheet(
-                                appViewModel = appViewModel,
-                                walletViewModel = walletViewModel,
-                                startDestination = sheet.route,
-                            )
-                        }
-
-                        is Sheet.Receive -> {
-                            val walletUiState by walletViewModel.uiState.collectAsState()
-                            ReceiveSheet(
-                                walletState = walletUiState,
-                                navigateToExternalConnection = {
-                                    navController.navigate(ExternalConnection())
-                                    appViewModel.hideSheet()
-                                }
-                            )
-                        }
+            val hasSeenWidgetsIntro by settingsViewModel.hasSeenWidgetsIntro.collectAsStateWithLifecycle()
+            val hasSeenShopIntro by settingsViewModel.hasSeenShopIntro.collectAsStateWithLifecycle()
 
-                        is Sheet.ActivityDateRangeSelector -> DateRangeSelectorSheet()
-                        is Sheet.ActivityTagSelector -> TagSelectorSheet()
-                        is Sheet.Pin -> PinSheet(sheet, appViewModel)
-                        is Sheet.Backup -> BackupSheet(sheet, onDismiss = { appViewModel.hideSheet() })
-                        is Sheet.LnurlAuth -> LnurlAuthSheet(sheet, appViewModel)
-                        Sheet.ForceTransfer -> ForceTransferSheet(appViewModel, transferViewModel)
-                        is Sheet.Gift -> GiftSheet(sheet, appViewModel)
-                        is Sheet.TimedSheet -> {
-                            when (sheet.type) {
-                                TimedSheetType.APP_UPDATE -> {
-                                    UpdateSheet(onCancel = { appViewModel.dismissTimedSheet() })
-                                }
-
-                                TimedSheetType.BACKUP -> {
-                                    BackupSheet(
-                                        sheet = Sheet.Backup(BackupRoute.Intro),
-                                        onDismiss = { appViewModel.dismissTimedSheet() }
-                                    )
-                                }
+            val currentSheet by appViewModel.currentSheet.collectAsStateWithLifecycle()
+            val hazeState = rememberHazeState()
 
-                                TimedSheetType.NOTIFICATIONS -> {
-                                    BackgroundPaymentsIntroSheet(
-                                        onContinue = {
-                                            appViewModel.dismissTimedSheet(skipQueue = true)
-                                            navController.navigate(Routes.BackgroundPaymentsSettings)
-                                            settingsViewModel.setBgPaymentsIntroSeen(true)
-                                        },
-                                    )
-                                }
+            Box(
+                modifier = Modifier.fillMaxSize()
+            ) {
+                SheetHost(
+                    shouldExpand = currentSheet != null,
+                    onDismiss = { appViewModel.hideSheet() },
+                    sheets = {
+                        when (val sheet = currentSheet) {
+                            null -> Unit
+                            is Sheet.Send -> {
+                                SendSheet(
+                                    appViewModel = appViewModel,
+                                    walletViewModel = walletViewModel,
+                                    startDestination = sheet.route,
+                                )
+                            }
 
-                                TimedSheetType.QUICK_PAY -> {
-                                    QuickPayIntroSheet(
-                                        onContinue = {
-                                            appViewModel.dismissTimedSheet(skipQueue = true)
-                                            navController.navigate(Routes.QuickPaySettings)
-                                        },
-                                    )
-                                }
+                            is Sheet.Receive -> {
+                                val walletUiState by walletViewModel.uiState.collectAsState()
+                                ReceiveSheet(
+                                    walletState = walletUiState,
+                                    navigateToExternalConnection = {
+                                        navController.navigate(ExternalConnection())
+                                        appViewModel.hideSheet()
+                                    }
+                                )
+                            }
 
-                                TimedSheetType.HIGH_BALANCE -> {
-                                    HighBalanceWarningSheet(
-                                        understoodClick = { appViewModel.dismissTimedSheet() },
-                                        learnMoreClick = {
-                                            val intent = Intent(Intent.ACTION_VIEW, Env.STORING_BITCOINS_URL.toUri())
-                                            context.startActivity(intent)
-                                            appViewModel.dismissTimedSheet(skipQueue = true)
-                                        }
-                                    )
+                            is Sheet.ActivityDateRangeSelector -> DateRangeSelectorSheet()
+                            is Sheet.ActivityTagSelector -> TagSelectorSheet()
+                            is Sheet.Pin -> PinSheet(sheet, appViewModel)
+                            is Sheet.Backup -> BackupSheet(sheet, onDismiss = { appViewModel.hideSheet() })
+                            is Sheet.LnurlAuth -> LnurlAuthSheet(sheet, appViewModel)
+                            Sheet.ForceTransfer -> ForceTransferSheet(appViewModel, transferViewModel)
+                            is Sheet.Gift -> GiftSheet(sheet, appViewModel)
+                            is Sheet.TimedSheet -> {
+                                when (sheet.type) {
+                                    TimedSheetType.APP_UPDATE -> {
+                                        UpdateSheet(onCancel = { appViewModel.dismissTimedSheet() })
+                                    }
+
+                                    TimedSheetType.BACKUP -> {
+                                        BackupSheet(
+                                            sheet = Sheet.Backup(BackupRoute.Intro),
+                                            onDismiss = { appViewModel.dismissTimedSheet() }
+                                        )
+                                    }
+
+                                    TimedSheetType.NOTIFICATIONS -> {
+                                        BackgroundPaymentsIntroSheet(
+                                            onContinue = {
+                                                appViewModel.dismissTimedSheet(skipQueue = true)
+                                                navController.navigate(Routes.BackgroundPaymentsSettings)
+                                                settingsViewModel.setBgPaymentsIntroSeen(true)
+                                            },
+                                        )
+                                    }
+
+                                    TimedSheetType.QUICK_PAY -> {
+                                        QuickPayIntroSheet(
+                                            onContinue = {
+                                                appViewModel.dismissTimedSheet(skipQueue = true)
+                                                navController.navigate(Routes.QuickPaySettings)
+                                            },
+                                        )
+                                    }
+
+                                    TimedSheetType.HIGH_BALANCE -> {
+                                        HighBalanceWarningSheet(
+                                            understoodClick = { appViewModel.dismissTimedSheet() },
+                                            learnMoreClick = {
+                                                val intent =
+                                                    Intent(Intent.ACTION_VIEW, Env.STORING_BITCOINS_URL.toUri())
+                                                context.startActivity(intent)
+                                                appViewModel.dismissTimedSheet(skipQueue = true)
+                                            }
+                                        )
+                                    }
                                 }
                             }
                         }
                     }
+                ) {
+                    RootNavHost(
+                        navController = navController,
+                        drawerState = drawerState,
+                        walletViewModel = walletViewModel,
+                        appViewModel = appViewModel,
+                        activityListViewModel = activityListViewModel,
+                        settingsViewModel = settingsViewModel,
+                        currencyViewModel = currencyViewModel,
+                        transferViewModel = transferViewModel,
+                    )
                 }
-            ) {
-                RootNavHost(
-                    navController = navController,
-                    walletViewModel = walletViewModel,
-                    appViewModel = appViewModel,
-                    activityListViewModel = activityListViewModel,
-                    settingsViewModel = settingsViewModel,
-                    currencyViewModel = currencyViewModel,
-                    transferViewModel = transferViewModel,
+
+                val navBackStackEntry by navController.currentBackStackEntryAsState()
+
+                val currentRoute = navBackStackEntry?.destination?.route
+
+                val showTabBar = currentRoute in listOf(
+                    Routes.Home::class.qualifiedName,
+                    Routes.AllActivity::class.qualifiedName,
+                )
+
+                AnimatedVisibility(
+                    visible = showTabBar && currentSheet == null,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .align(Alignment.BottomCenter)
+                ) {
+                    TabBar(
+                        hazeState = hazeState,
+                        onSendClick = { appViewModel.showSheet(Sheet.Send()) },
+                        onReceiveClick = { appViewModel.showSheet(Sheet.Receive) },
+                        onScanClick = { navController.navigateToScanner() },
+                    )
+                }
+
+                DrawerMenu(
+                    drawerState = drawerState,
+                    rootNavController = navController,
+                    hasSeenWidgetsIntro = hasSeenWidgetsIntro,
+                    hasSeenShopIntro = hasSeenShopIntro,
+                    modifier = Modifier.align(Alignment.TopEnd),
                 )
             }
         }
@@ -439,6 +497,7 @@ fun ContentView(
 @Composable
 private fun RootNavHost(
     navController: NavHostController,
+    drawerState: DrawerState,
     walletViewModel: WalletViewModel,
     appViewModel: AppViewModel,
     activityListViewModel: ActivityListViewModel,
@@ -449,7 +508,18 @@ private fun RootNavHost(
     val scope = rememberCoroutineScope()
 
     NavHost(navController, startDestination = Routes.Home) {
-        home(walletViewModel, appViewModel, activityListViewModel, settingsViewModel, navController)
+        home(
+            walletViewModel = walletViewModel,
+            appViewModel = appViewModel,
+            activityListViewModel = activityListViewModel,
+            settingsViewModel = settingsViewModel,
+            navController = navController,
+            drawerState = drawerState
+        )
+        allActivity(
+            activityListViewModel = activityListViewModel,
+            navController = navController,
+        )
         settings(navController, settingsViewModel)
         profile(navController, settingsViewModel)
         shop(navController, settingsViewModel, appViewModel)
@@ -575,7 +645,6 @@ private fun RootNavHost(
                 SpendingAdvancedScreen(
                     viewModel = transferViewModel,
                     onBackClick = { navController.popBackStack() },
-                    onCloseClick = { navController.navigateToHome() },
                     onOrderCreated = { navController.popBackStack<Routes.SpendingConfirm>(inclusive = false) },
                 )
             }
@@ -589,7 +658,6 @@ private fun RootNavHost(
             composableWithDefaultTransitions<Routes.SettingUp> {
                 SettingUpScreen(
                     viewModel = transferViewModel,
-                    onCloseClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
                     onContinueClick = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
                 )
             }
@@ -628,11 +696,11 @@ private fun RootNavHost(
                 )
             }
             navigationWithDefaultTransitions<Routes.ExternalNav>(
-                startDestination = Routes.ExternalConnection(),
+                startDestination = ExternalConnection(),
             ) {
-                composableWithDefaultTransitions<Routes.ExternalConnection> {
+                composableWithDefaultTransitions<ExternalConnection> {
                     val parentEntry = remember(it) { navController.getBackStackEntry(Routes.ExternalNav) }
-                    val route = it.toRoute<Routes.ExternalConnection>()
+                    val route = it.toRoute<ExternalConnection>()
                     val viewModel = hiltViewModel<ExternalNodeViewModel>(parentEntry)
 
                     ExternalConnectionScreen(
@@ -682,7 +750,6 @@ private fun RootNavHost(
                 composableWithDefaultTransitions<Routes.ExternalSuccess> {
                     ExternalSuccessScreen(
                         onContinue = { navController.popBackStack<Routes.TransferRoot>(inclusive = true) },
-                        onClose = { navController.navigateToHome() },
                     )
                 }
                 composableWithDefaultTransitions<Routes.ExternalFeeCustom> {
@@ -692,7 +759,6 @@ private fun RootNavHost(
                     ExternalFeeCustomScreen(
                         viewModel = viewModel,
                         onBack = { navController.popBackStack() },
-                        onClose = { navController.navigateToHome() },
                     )
                 }
             }
@@ -707,6 +773,7 @@ private fun NavGraphBuilder.home(
     activityListViewModel: ActivityListViewModel,
     settingsViewModel: SettingsViewModel,
     navController: NavHostController,
+    drawerState: DrawerState,
 ) {
     composable<Routes.Home> {
         HomeNav(
@@ -715,6 +782,23 @@ private fun NavGraphBuilder.home(
             activityListViewModel = activityListViewModel,
             settingsViewModel = settingsViewModel,
             rootNavController = navController,
+            drawerState = drawerState,
+        )
+    }
+}
+
+private fun NavGraphBuilder.allActivity(
+    activityListViewModel: ActivityListViewModel,
+    navController: NavHostController,
+) {
+    composableWithDefaultTransitions<Routes.AllActivity> {
+        AllActivityScreen(
+            viewModel = activityListViewModel,
+            onBack = {
+                activityListViewModel.clearFilters()
+                navController.navigateToHome()
+            },
+            onActivityItemClick = { id -> navController.navigateToActivityItem(id) },
         )
     }
 }
@@ -730,7 +814,6 @@ private fun NavGraphBuilder.settings(
     composableWithDefaultTransitions<Routes.QuickPayIntro> {
         QuickPayIntroScreen(
             onBack = { navController.popBackStack() },
-            onClose = { navController.navigateToHome() },
             onContinue = {
                 settingsViewModel.setQuickPayIntroSeen(true)
                 navController.navigate(Routes.QuickPaySettings)
@@ -740,7 +823,6 @@ private fun NavGraphBuilder.settings(
     composableWithDefaultTransitions<Routes.QuickPaySettings> {
         QuickPaySettingsScreen(
             onBack = { navController.popBackStack() },
-            onClose = { navController.navigateToHome() },
         )
     }
     composableWithDefaultTransitions<Routes.DevSettings> {
@@ -766,7 +848,6 @@ private fun NavGraphBuilder.profile(
 ) {
     composableWithDefaultTransitions<Routes.ProfileIntro> {
         ProfileIntroScreen(
-            onClose = { navController.navigateToHome() },
             onContinue = {
                 settingsViewModel.setHasSeenProfileIntro(true)
                 navController.navigate(Routes.CreateProfile)
@@ -776,7 +857,6 @@ private fun NavGraphBuilder.profile(
     composableWithDefaultTransitions<Routes.CreateProfile> {
         CreateProfileScreen(
             onBack = { navController.popBackStack() },
-            onClose = { navController.navigateToHome() },
         )
     }
 }
@@ -788,7 +868,6 @@ private fun NavGraphBuilder.shop(
 ) {
     composableWithDefaultTransitions<Routes.ShopIntro> {
         ShopIntroScreen(
-            onClose = { navController.navigateToHome() },
             onContinue = {
                 settingsViewModel.setHasSeenShopIntro(true)
                 navController.navigate(Routes.ShopDiscover)
@@ -797,7 +876,6 @@ private fun NavGraphBuilder.shop(
     }
     composableWithDefaultTransitions<Routes.ShopDiscover> {
         ShopDiscoverScreen(
-            onClose = { navController.navigateToHome() },
             onBack = { navController.popBackStack() },
             navigateWebView = { page, title ->
                 navController.navigate(Routes.ShopWebView(page = page, title = title))
@@ -832,14 +910,12 @@ private fun NavGraphBuilder.generalSettings(navController: NavHostController) {
     composableWithDefaultTransitions<Routes.BackgroundPaymentsSettings> {
         BackgroundPaymentsSettings(
             onBack = { navController.popBackStack() },
-            onClose = { navController.navigateToHome() },
         )
     }
 
     composableWithDefaultTransitions<Routes.BackgroundPaymentsIntro> {
         BackgroundPaymentsIntroScreen(
             onBack = { navController.popBackStack() },
-            onClose = { navController.navigateToHome() },
             onContinue = {
                 navController.navigate(Routes.BackgroundPaymentsSettings)
             }
@@ -873,9 +949,6 @@ private fun NavGraphBuilder.aboutSettings(navController: NavHostController) {
         AboutScreen(
             onBack = {
                 navController.popBackStack()
-            },
-            onClose = {
-                navController.navigateToHome()
             }
         )
     }
@@ -1152,7 +1225,6 @@ private fun NavGraphBuilder.support(
     composableWithDefaultTransitions<Routes.ReportIssue> {
         ReportIssueScreen(
             onBack = { navController.popBackStack() },
-            onClose = { navController.navigateToHome() },
             navigateResultScreen = { isSuccess ->
                 if (isSuccess) {
                     navController.navigate(Routes.ReportIssueSuccess)
@@ -1187,7 +1259,6 @@ private fun NavGraphBuilder.widgets(
 ) {
     composableWithDefaultTransitions<Routes.WidgetsIntro> {
         WidgetsIntroScreen(
-            onClose = { navController.navigateToHome() },
             onContinue = {
                 settingsViewModel.setHasSeenWidgetsIntro(true)
                 navController.navigate(Routes.AddWidget)
@@ -1196,7 +1267,6 @@ private fun NavGraphBuilder.widgets(
     }
     composableWithDefaultTransitions<Routes.AddWidget> {
         AddWidgetsScreen(
-            onClose = { navController.navigateToHome() },
             onWidgetSelected = { widgetType ->
                 when (widgetType) {
                     WidgetType.BLOCK -> navController.navigate(Routes.BlocksPreview)
@@ -1237,7 +1307,6 @@ private fun NavGraphBuilder.widgets(
 
             HeadlinesEditScreen(
                 headlinesViewModel = viewModel,
-                onClose = { navController.navigateToHome() },
                 onBack = { navController.popBackStack() },
                 navigatePreview = {
                     navController.navigate(Routes.HeadlinesPreview)
@@ -1265,7 +1334,6 @@ private fun NavGraphBuilder.widgets(
 
             FactsEditScreen(
                 factsViewModel = viewModel,
-                onClose = { navController.navigateToHome() },
                 onBack = { navController.popBackStack() },
                 navigatePreview = { navController.navigate(Routes.FactsPreview) }
             )
@@ -1317,7 +1385,6 @@ private fun NavGraphBuilder.widgets(
 
             WeatherEditScreen(
                 weatherViewModel = viewModel,
-                onClose = { navController.navigateToHome() },
                 onBack = { navController.popBackStack() },
                 navigatePreview = { navController.navigate(Routes.WeatherPreview) }
             )
@@ -1342,7 +1409,6 @@ private fun NavGraphBuilder.widgets(
             val viewModel = hiltViewModel<PriceViewModel>(parentEntry)
             PriceEditScreen(
                 viewModel = viewModel,
-                onClose = { navController.navigateToHome() },
                 onBack = { navController.popBackStack() },
                 navigatePreview = { navController.navigate(Routes.PricePreview) }
             )
@@ -1363,6 +1429,22 @@ fun NavController.navigateToHome() {
     }
 }
 
+fun NavController.navigateToAllActivity() {
+    navigate(Routes.AllActivity) {
+        launchSingleTop = true
+    }
+}
+
+/**
+ * Navigates to the specified route only if not already on that route.
+ */
+inline fun <reified T : Any> NavController.navigateIfNotCurrent(route: T) {
+    val isOnRoute = currentBackStackEntry?.destination?.hasRoute<T>() ?: false
+    if (!isOnRoute) {
+        navigate(route)
+    }
+}
+
 fun NavController.navigateToSettings() = navigate(
     route = Routes.Settings,
 )
@@ -1813,4 +1895,7 @@ sealed interface Routes {
 
     @Serializable
     data object BackgroundPaymentsSettings : Routes
+
+    @Serializable
+    data object AllActivity : Routes
 }
diff --git a/app/src/main/java/to/bitkit/ui/Locals.kt b/app/src/main/java/to/bitkit/ui/Locals.kt
index 60dbef5c6..2843e38c4 100644
--- a/app/src/main/java/to/bitkit/ui/Locals.kt
+++ b/app/src/main/java/to/bitkit/ui/Locals.kt
@@ -1,5 +1,6 @@
 package to.bitkit.ui
 
+import androidx.compose.material3.DrawerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
@@ -19,6 +20,7 @@ val LocalBalances = compositionLocalOf { BalanceState() }
 val LocalCurrencies = compositionLocalOf { CurrencyState() }
 
 // Statics
+val LocalDrawerState = staticCompositionLocalOf<DrawerState?> { null }
 val LocalAppViewModel = staticCompositionLocalOf<AppViewModel?> { null }
 val LocalWalletViewModel = staticCompositionLocalOf<WalletViewModel?> { null }
 val LocalBlocktankViewModel = staticCompositionLocalOf<BlocktankViewModel?> { null }
@@ -51,3 +53,6 @@ val settingsViewModel: SettingsViewModel?
 
 val backupsViewModel: BackupsViewModel?
     @Composable get() = LocalBackupsViewModel.current
+
+val drawerState: DrawerState?
+    @Composable get() = LocalDrawerState.current
diff --git a/app/src/main/java/to/bitkit/ui/NodeInfoScreen.kt b/app/src/main/java/to/bitkit/ui/NodeInfoScreen.kt
index 50d4be7dc..a04f243a1 100644
--- a/app/src/main/java/to/bitkit/ui/NodeInfoScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/NodeInfoScreen.kt
@@ -60,7 +60,7 @@ import to.bitkit.ui.components.rememberMoneyText
 import to.bitkit.ui.components.settings.SectionHeader
 import to.bitkit.ui.components.settings.SettingsTextButtonRow
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.theme.AppThemeSurface
@@ -88,7 +88,6 @@ fun NodeInfoScreen(
         isDevModeEnabled = isDevModeEnabled,
         balanceDetails = lightningState.balances,
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
         onRefresh = { wallet.onPullToRefresh() },
         onDisconnectPeer = { wallet.disconnectPeer(it) },
         onCopy = { text ->
@@ -108,7 +107,6 @@ private fun Content(
     isDevModeEnabled: Boolean,
     balanceDetails: BalanceDetails? = null,
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
     onRefresh: () -> Unit = {},
     onDisconnectPeer: (PeerDetails) -> Unit = {},
     onCopy: (String) -> Unit = {},
@@ -117,7 +115,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.lightning__node_info),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClose) },
+            actions = { DrawerNavIcon() },
         )
         PullToRefreshBox(
             isRefreshing = uiState.isRefreshing,
diff --git a/app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt b/app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt
index 048df91da..7c3c31822 100644
--- a/app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt
+++ b/app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt
@@ -39,12 +39,13 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
 import androidx.navigation.NavController
+import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.compose.rememberNavController
 import kotlinx.coroutines.launch
 import to.bitkit.R
 import to.bitkit.ui.Routes
-import to.bitkit.ui.navigateToSettings
-import to.bitkit.ui.screens.wallets.HomeRoutes
+import to.bitkit.ui.navigateIfNotCurrent
+import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.shared.util.blockPointerInputPassthrough
 import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.theme.AppThemeSurface
@@ -60,7 +61,6 @@ private val drawerWidth = 200.dp
 @Composable
 fun DrawerMenu(
     drawerState: DrawerState,
-    walletNavController: NavController,
     rootNavController: NavController,
     hasSeenWidgetsIntro: Boolean,
     hasSeenShopIntro: Boolean,
@@ -96,21 +96,20 @@ fun DrawerMenu(
         )
     ) {
         Menu(
-            walletNavController = walletNavController,
             rootNavController = rootNavController,
             drawerState = drawerState,
             onClickAddWidget = {
                 if (!hasSeenWidgetsIntro) {
-                    rootNavController.navigate(Routes.WidgetsIntro)
+                    rootNavController.navigateIfNotCurrent(Routes.WidgetsIntro)
                 } else {
-                    rootNavController.navigate(Routes.AddWidget)
+                    rootNavController.navigateIfNotCurrent(Routes.AddWidget)
                 }
             },
             onClickShop = {
                 if (!hasSeenShopIntro) {
-                    rootNavController.navigate(Routes.ShopIntro)
+                    rootNavController.navigateIfNotCurrent(Routes.ShopIntro)
                 } else {
-                    rootNavController.navigate(Routes.ShopDiscover)
+                    rootNavController.navigateIfNotCurrent(Routes.ShopDiscover)
                 }
             },
         )
@@ -119,7 +118,6 @@ fun DrawerMenu(
 
 @Composable
 private fun Menu(
-    walletNavController: NavController,
     rootNavController: NavController,
     drawerState: DrawerState,
     onClickAddWidget: () -> Unit,
@@ -140,6 +138,11 @@ private fun Menu(
             label = stringResource(R.string.wallet__drawer__wallet),
             iconRes = R.drawable.ic_coins,
             onClick = {
+                val isOnHome = rootNavController.currentBackStackEntry
+                    ?.destination?.hasRoute<Routes.Home>() ?: false
+                if (!isOnHome) {
+                    rootNavController.navigateToHome()
+                }
                 scope.launch { drawerState.close() }
             },
             modifier = Modifier.testTag("DrawerWallet")
@@ -149,7 +152,7 @@ private fun Menu(
             label = stringResource(R.string.wallet__drawer__activity),
             iconRes = R.drawable.ic_heartbeat,
             onClick = {
-                walletNavController.navigate(HomeRoutes.AllActivity)
+                rootNavController.navigateIfNotCurrent(Routes.AllActivity)
                 scope.launch { drawerState.close() }
             },
             modifier = Modifier.testTag("DrawerActivity")
@@ -193,7 +196,7 @@ private fun Menu(
             label = stringResource(R.string.wallet__drawer__settings),
             iconRes = R.drawable.ic_settings,
             onClick = {
-                rootNavController.navigateToSettings()
+                rootNavController.navigateIfNotCurrent(Routes.Settings)
                 scope.launch { drawerState.close() }
             },
             modifier = Modifier.testTag("DrawerSettings")
@@ -206,7 +209,7 @@ private fun Menu(
             modifier = Modifier
                 .fillMaxWidth()
                 .clickableAlpha {
-                    rootNavController.navigate(Routes.AppStatus)
+                    rootNavController.navigateIfNotCurrent(Routes.AppStatus)
                     scope.launch { drawerState.close() }
                 }
         ) {
@@ -214,7 +217,9 @@ private fun Menu(
                 showText = true,
                 showReady = true,
                 color = Colors.Black,
-                modifier = Modifier.padding(vertical = 16.dp).testTag("DrawerAppStatus")
+                modifier = Modifier
+                    .padding(vertical = 16.dp)
+                    .testTag("DrawerAppStatus")
             )
         }
     }
@@ -298,7 +303,6 @@ private fun Preview() {
         val navController = rememberNavController()
         Box {
             DrawerMenu(
-                walletNavController = navController,
                 rootNavController = navController,
                 drawerState = rememberDrawerState(initialValue = DrawerValue.Open),
                 hasSeenWidgetsIntro = false,
diff --git a/app/src/main/java/to/bitkit/ui/components/InfoScreenContent.kt b/app/src/main/java/to/bitkit/ui/components/InfoScreenContent.kt
index 9aaf4d03e..ff82b50c0 100644
--- a/app/src/main/java/to/bitkit/ui/components/InfoScreenContent.kt
+++ b/app/src/main/java/to/bitkit/ui/components/InfoScreenContent.kt
@@ -21,7 +21,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import to.bitkit.R
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -37,7 +37,6 @@ fun InfoScreenContent(
     showCloseButton: Boolean = true,
     buttonText: String,
     onButtonClick: () -> Unit,
-    onCloseClick: () -> Unit,
     testTag: String,
 ) {
     ScreenColumn {
@@ -46,7 +45,7 @@ fun InfoScreenContent(
             onBackClick = null,
             actions = {
                 if (showCloseButton) {
-                    CloseNavIcon(onCloseClick)
+                    DrawerNavIcon()
                 }
             },
         )
@@ -100,7 +99,6 @@ private fun Preview() {
             image = painterResource(R.drawable.check),
             buttonText = stringResource(R.string.common__ok),
             onButtonClick = {},
-            onCloseClick = {},
             testTag = "",
         )
     }
diff --git a/app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt b/app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt
index a0cad7558..e6c122822 100644
--- a/app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt
+++ b/app/src/main/java/to/bitkit/ui/scaffold/AppTopBar.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -18,12 +17,15 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
 import to.bitkit.R
+import to.bitkit.ui.LocalDrawerState
 import to.bitkit.ui.components.Title
 import to.bitkit.ui.theme.AppThemeSurface
 
@@ -89,19 +91,24 @@ fun BackNavIcon(
 }
 
 @Composable
-fun CloseNavIcon(
-    onClick: () -> Unit,
+fun DrawerNavIcon(
     modifier: Modifier = Modifier,
 ) {
-    IconButton(
-        onClick = onClick,
-        modifier = modifier.testTag("NavigationClose")
-    ) {
-        Icon(
-            imageVector = Icons.Default.Close,
-            contentDescription = stringResource(R.string.common__close),
-            modifier = Modifier.size(24.dp)
-        )
+    val isPreview = LocalInspectionMode.current
+    val drawerState = LocalDrawerState.current
+    val scope = androidx.compose.runtime.rememberCoroutineScope()
+
+    if (drawerState != null || isPreview) {
+        IconButton(
+            onClick = { scope.launch { drawerState?.open() } },
+            modifier = modifier.testTag("HeaderMenu")
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_list),
+                contentDescription = stringResource(R.string.settings__settings),
+                modifier = Modifier.size(24.dp)
+            )
+        }
     }
 }
 
@@ -153,7 +160,7 @@ private fun Preview3() {
             titleText = "Title and Action",
             onBackClick = {},
             actions = {
-                CloseNavIcon(onClick = {})
+                DrawerNavIcon()
             }
         )
     }
diff --git a/app/src/main/java/to/bitkit/ui/screens/profile/CreateProfileScreen.kt b/app/src/main/java/to/bitkit/ui/screens/profile/CreateProfileScreen.kt
index f96d617a7..0c5071c03 100644
--- a/app/src/main/java/to/bitkit/ui/screens/profile/CreateProfileScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/profile/CreateProfileScreen.kt
@@ -11,21 +11,20 @@ import androidx.compose.ui.unit.dp
 import to.bitkit.R
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 
 @Composable
 fun CreateProfileScreen(
-    onClose: () -> Unit,
     onBack: () -> Unit,
 ) { // TODO IMPLEMENT
     ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.slashtags__profile_create),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -47,7 +46,6 @@ fun CreateProfileScreen(
 private fun Preview() {
     AppThemeSurface {
         CreateProfileScreen(
-            onClose = {},
             onBack = {},
         )
     }
diff --git a/app/src/main/java/to/bitkit/ui/screens/profile/ProfileIntroScreen.kt b/app/src/main/java/to/bitkit/ui/screens/profile/ProfileIntroScreen.kt
index db16fc134..03126789c 100644
--- a/app/src/main/java/to/bitkit/ui/screens/profile/ProfileIntroScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/profile/ProfileIntroScreen.kt
@@ -17,7 +17,7 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -25,14 +25,13 @@ import to.bitkit.ui.utils.withAccent
 
 @Composable
 fun ProfileIntroScreen(
-    onClose: () -> Unit,
     onContinue: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.slashtags__profile),
             onBackClick = null,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -69,7 +68,6 @@ fun ProfileIntroScreen(
 private fun Preview() {
     AppThemeSurface {
         ProfileIntroScreen(
-            onClose = {},
             onContinue = {}
         )
     }
diff --git a/app/src/main/java/to/bitkit/ui/screens/settings/DevSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/screens/settings/DevSettingsScreen.kt
index 413b9b7ff..20fc09b2d 100644
--- a/app/src/main/java/to/bitkit/ui/screens/settings/DevSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/settings/DevSettingsScreen.kt
@@ -21,9 +21,8 @@ import to.bitkit.ui.appViewModel
 import to.bitkit.ui.components.settings.SectionHeader
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsTextButtonRow
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.shared.util.shareZipFile
@@ -43,7 +42,7 @@ fun DevSettingsScreen(
         AppTopBar(
             titleText = stringResource(R.string.settings__dev_title),
             onBackClick = { navController.popBackStack() },
-            actions = { CloseNavIcon(onClick = { navController.navigateToHome() }) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
diff --git a/app/src/main/java/to/bitkit/ui/screens/settings/FeeSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/screens/settings/FeeSettingsScreen.kt
index 336c8adc8..d7fee8bc0 100644
--- a/app/src/main/java/to/bitkit/ui/screens/settings/FeeSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/settings/FeeSettingsScreen.kt
@@ -18,9 +18,8 @@ import com.synonym.bitkitcore.FeeRates
 import to.bitkit.R
 import to.bitkit.ui.components.settings.SectionHeader
 import to.bitkit.ui.components.settings.SettingsTextButtonRow
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.viewmodels.FeeSettingsUiState
@@ -40,7 +39,6 @@ fun FeeSettingsScreen(
     Content(
         uiState = uiState,
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
     )
 }
 
@@ -48,13 +46,12 @@ fun FeeSettingsScreen(
 private fun Content(
     uiState: FeeSettingsUiState,
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = "Fee Settings",
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
diff --git a/app/src/main/java/to/bitkit/ui/screens/shop/ShopIntroScreen.kt b/app/src/main/java/to/bitkit/ui/screens/shop/ShopIntroScreen.kt
index f3e6a39bd..269865df5 100644
--- a/app/src/main/java/to/bitkit/ui/screens/shop/ShopIntroScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/shop/ShopIntroScreen.kt
@@ -17,7 +17,7 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -25,14 +25,13 @@ import to.bitkit.ui.utils.withAccent
 
 @Composable
 fun ShopIntroScreen(
-    onClose: () -> Unit,
     onContinue: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = "",
             onBackClick = null,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -67,7 +66,6 @@ fun ShopIntroScreen(
 private fun Preview() {
     AppThemeSurface {
         ShopIntroScreen(
-            onClose = {},
             onContinue = {}
         )
     }
diff --git a/app/src/main/java/to/bitkit/ui/screens/shop/shopDiscover/ShopDiscoverScreen.kt b/app/src/main/java/to/bitkit/ui/screens/shop/shopDiscover/ShopDiscoverScreen.kt
index 0050bad33..4184c6c05 100644
--- a/app/src/main/java/to/bitkit/ui/screens/shop/shopDiscover/ShopDiscoverScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/shop/shopDiscover/ShopDiscoverScreen.kt
@@ -47,7 +47,7 @@ import to.bitkit.ui.components.SuggestionCard
 import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.shared.util.gradientBackground
@@ -60,7 +60,6 @@ private const val SHOP_CARD_SIZE = 164
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ShopDiscoverScreen(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     navigateWebView: (String, String) -> Unit, // Page, Title
 ) {
@@ -76,7 +75,7 @@ fun ShopDiscoverScreen(
         AppTopBar(
             titleText = stringResource(R.string.other__shop__discover__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         PrimaryTabRow(
@@ -279,6 +278,6 @@ private fun MapTabContent() {
 @Composable
 private fun Preview() {
     AppThemeSurface {
-        ShopDiscoverScreen(onClose = {}, onBack = {}, navigateWebView = { _, _ -> })
+        ShopDiscoverScreen(onBack = {}, navigateWebView = { _, _ -> })
     }
 }
diff --git a/app/src/main/java/to/bitkit/ui/screens/shop/shopWebView/ShopWebViewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/shop/shopWebView/ShopWebViewScreen.kt
index 00e19df4f..3f6f69248 100644
--- a/app/src/main/java/to/bitkit/ui/screens/shop/shopWebView/ShopWebViewScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/shop/shopWebView/ShopWebViewScreen.kt
@@ -21,7 +21,7 @@ import to.bitkit.R
 import to.bitkit.env.Env
 import to.bitkit.ext.configureForBasicWebContent
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 
@@ -49,7 +49,7 @@ fun ShopWebViewScreen(
         AppTopBar(
             titleText = "${stringResource(R.string.other__shop__discover__nav_title)} $title",
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Box(modifier = Modifier.weight(1f)) {
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 2fbc0469d..4c9d7d07f 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
@@ -20,7 +20,7 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.RectangleButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -37,7 +37,7 @@ fun FundingAdvancedScreen(
         AppTopBar(
             titleText = stringResource(R.string.lightning__funding_advanced__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 0c181d625..cb5d441a5 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
@@ -33,7 +33,7 @@ import to.bitkit.ui.components.BodyMB
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.RectangleButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -58,7 +58,7 @@ fun FundingScreen(
         AppTopBar(
             titleText = stringResource(R.string.lightning__funding__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 e078f1e14..ee7635d6f 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
@@ -21,7 +21,7 @@ import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.LightningChannel
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -65,7 +65,7 @@ private fun LiquidityScreen(
         AppTopBar(
             titleText = stringResource(R.string.lightning__transfer__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 bdcb67ed8..120575491 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
@@ -35,7 +35,7 @@ import to.bitkit.ui.components.MoneySSB
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.currencyViewModel
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppSwitchDefaults
 import to.bitkit.ui.theme.AppThemeSurface
@@ -112,7 +112,7 @@ private fun SavingsAdvancedContent(
         AppTopBar(
             titleText = stringResource(R.string.lightning__transfer__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 5d3814ece..9d834591b 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
@@ -36,7 +36,7 @@ import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SwipeToConfirm
 import to.bitkit.ui.currencyViewModel
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -104,7 +104,7 @@ private fun SavingsConfirmContent(
         AppTopBar(
             titleText = stringResource(R.string.lightning__transfer__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 3ac6c4c95..ed0e5eb0b 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
@@ -22,7 +22,7 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.shared.util.screen
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -50,7 +50,7 @@ fun SavingsIntroScreen(
         AppTopBar(
             titleText = stringResource(R.string.lightning__transfer__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 452fc520e..0267b08d1 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
@@ -32,7 +32,7 @@ import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.Sheet
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.screens.transfer.components.TransferAnimationView
 import to.bitkit.ui.theme.AppThemeSurface
@@ -88,7 +88,6 @@ fun SavingsProgressScreen(
     Content(
         progressState = progressState,
         onContinueClick = { onContinueClick() },
-        onCloseClick = onCloseClick,
     )
 }
 
@@ -96,7 +95,6 @@ fun SavingsProgressScreen(
 private fun Content(
     progressState: SavingsProgressState,
     onContinueClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val inProgress = progressState == SavingsProgressState.PROGRESS
     ScreenColumn(
@@ -111,7 +109,7 @@ private fun Content(
             },
             onBackClick = null,
             actions = {
-                if (inProgress) CloseNavIcon(onCloseClick)
+                DrawerNavIcon()
             },
         )
         Column(
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SettingUpScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SettingUpScreen.kt
index 846d7c37d..983d08a02 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/SettingUpScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/SettingUpScreen.kt
@@ -30,7 +30,7 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.screens.transfer.components.ProgressSteps
 import to.bitkit.ui.screens.transfer.components.TransferAnimationView
@@ -46,7 +46,6 @@ import to.bitkit.viewmodels.TransferViewModel
 fun SettingUpScreen(
     viewModel: TransferViewModel,
     onContinueClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val app = appViewModel ?: return
     val lightningSetupStep by viewModel.lightningSetupStep.collectAsState()
@@ -82,7 +81,6 @@ fun SettingUpScreen(
             viewModel.resetSpendingState()
             onContinueClick()
         },
-        onCloseClick = onCloseClick,
     )
 }
 
@@ -90,7 +88,6 @@ fun SettingUpScreen(
 private fun SettingUpScreen(
     lightningSetupStep: Int,
     onContinueClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
 ) {
     val inProgress = lightningSetupStep < 3
     ScreenColumn(
@@ -102,7 +99,7 @@ private fun SettingUpScreen(
                 else -> stringResource(R.string.lightning__transfer_success__nav_title)
             },
             onBackClick = null,
-            actions = { if (inProgress) CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAdvancedScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAdvancedScreen.kt
index aad032c9b..96cb8dbd6 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAdvancedScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/SpendingAdvancedScreen.kt
@@ -42,7 +42,7 @@ import to.bitkit.ui.components.NumberPadTextField
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -59,7 +59,6 @@ import to.bitkit.viewmodels.previewAmountInputViewModel
 fun SpendingAdvancedScreen(
     viewModel: TransferViewModel,
     onBackClick: () -> Unit = {},
-    onCloseClick: () -> Unit = {},
     onOrderCreated: () -> Unit = {},
     currencies: CurrencyState = LocalCurrencies.current,
     amountInputViewModel: AmountInputViewModel = hiltViewModel(),
@@ -114,7 +113,6 @@ fun SpendingAdvancedScreen(
         amountInputViewModel = amountInputViewModel,
         currencies = currencies,
         onBack = onBackClick,
-        onClose = onCloseClick,
         onContinue = {
             isLoading = true
             viewModel.onSpendingAdvancedContinue(amountUiState.sats)
@@ -131,7 +129,6 @@ private fun Content(
     isLoading: Boolean,
     amountInputViewModel: AmountInputViewModel,
     onBack: () -> Unit,
-    onClose: () -> Unit,
     onContinue: () -> Unit,
     currencies: CurrencyState = LocalCurrencies.current,
 ) {
@@ -139,7 +136,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.lightning__transfer__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClose) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
@@ -254,7 +251,6 @@ private fun Preview() {
             amountInputViewModel = previewAmountInputViewModel(),
             isLoading = false,
             onBack = {},
-            onClose = {},
             onContinue = {},
         )
     }
@@ -280,7 +276,6 @@ private fun PreviewLoading() {
             amountInputViewModel = previewAmountInputViewModel(),
             isLoading = true,
             onBack = {},
-            onClose = {},
             onContinue = {},
         )
     }
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 c7c753f0a..c9d6a2822 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
@@ -36,7 +36,7 @@ import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.components.UnitButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -126,7 +126,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.lightning__transfer__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
 
         if (isNodeRunning) {
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 e22c605ff..b4aa061b7 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
@@ -54,7 +54,7 @@ import to.bitkit.ui.components.SwipeToConfirm
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.components.settings.SettingsSwitchRow
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppSwitchDefaults
 import to.bitkit.ui.theme.AppThemeSurface
@@ -131,7 +131,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.lightning__transfer__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Box(modifier = Modifier.fillMaxSize()) {
             if (!isAdvanced) {
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 a135b791b..03f51f791 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
@@ -21,7 +21,7 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.shared.util.screen
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -49,7 +49,7 @@ fun SpendingIntroScreen(
         AppTopBar(
             titleText = stringResource(R.string.lightning__transfer__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 39a837151..ebc83972d 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
@@ -25,7 +25,7 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
@@ -53,7 +53,7 @@ fun TransferIntroScreen(
         AppTopBar(
             titleText = null,
             onBackClick = null,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 592b1f4f9..8bcc947b1 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
@@ -37,7 +37,7 @@ import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.components.UnitButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -91,7 +91,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.lightning__external__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 b715be696..0d21cea07 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
@@ -38,7 +38,7 @@ import to.bitkit.ui.components.FeeInfo
 import to.bitkit.ui.components.MoneySSB
 import to.bitkit.ui.components.SwipeToConfirm
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.screens.transfer.external.ExternalNodeContract.SideEffect
 import to.bitkit.ui.shared.util.clickableAlpha
@@ -86,7 +86,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.lightning__external__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 f34f1ad6d..1c7e1cb50 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
@@ -48,7 +48,7 @@ import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.TextInput
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.screens.scanner.SCAN_RESULT_KEY
 import to.bitkit.ui.screens.transfer.external.ExternalNodeContract.SideEffect
@@ -124,7 +124,7 @@ private fun ExternalConnectionContent(
         AppTopBar(
             titleText = stringResource(R.string.lightning__external__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalFeeCustomScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalFeeCustomScreen.kt
index 85b56e7f6..f2cd73f25 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalFeeCustomScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalFeeCustomScreen.kt
@@ -37,7 +37,7 @@ import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.currencyViewModel
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.shared.toast.ToastEventBus
 import to.bitkit.ui.theme.AppThemeSurface
@@ -48,7 +48,6 @@ import to.bitkit.ui.utils.withAccent
 fun ExternalFeeCustomScreen(
     viewModel: ExternalNodeViewModel,
     onBack: () -> Unit,
-    onClose: () -> Unit,
 ) {
     val uiState by viewModel.uiState.collectAsState()
     val currency = currencyViewModel ?: return
@@ -103,7 +102,6 @@ fun ExternalFeeCustomScreen(
             onBack()
         },
         onBack = onBack,
-        onClose = onClose,
     )
 }
 
@@ -114,7 +112,6 @@ private fun Content(
     onKeyPress: (String) -> Unit = {},
     onContinue: () -> Unit = {},
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
 ) {
     val feeRate = input.toUIntOrNull() ?: 0u
     val isValid = feeRate != 0u
@@ -123,7 +120,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.lightning__external__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClose) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalSuccessScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalSuccessScreen.kt
index 11f7fae9b..413e5abe0 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalSuccessScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/external/ExternalSuccessScreen.kt
@@ -15,7 +15,6 @@ import to.bitkit.ui.utils.withAccentBoldBright
 @Composable
 fun ExternalSuccessScreen(
     onContinue: () -> Unit,
-    onClose: () -> Unit,
 ) {
     InfoScreenContent(
         navTitle = stringResource(R.string.lightning__external__nav_title),
@@ -24,7 +23,6 @@ fun ExternalSuccessScreen(
         image = painterResource(R.drawable.switch_box),
         buttonText = localizedRandom(R.string.common__ok_random),
         onButtonClick = onContinue,
-        onCloseClick = onClose,
         testTag = "ExternalSuccess",
     )
 }
@@ -35,7 +33,6 @@ private fun ExternalSuccessScreenPreview() {
     AppThemeSurface {
         ExternalSuccessScreen(
             onContinue = {},
-            onClose = {},
         )
     }
 }
diff --git a/app/src/main/java/to/bitkit/ui/screens/transfer/external/LnurlChannelScreen.kt b/app/src/main/java/to/bitkit/ui/screens/transfer/external/LnurlChannelScreen.kt
index 9e1236f98..6329212e9 100644
--- a/app/src/main/java/to/bitkit/ui/screens/transfer/external/LnurlChannelScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/transfer/external/LnurlChannelScreen.kt
@@ -37,7 +37,7 @@ import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -66,7 +66,6 @@ fun LnurlChannelScreen(
     Content(
         uiState = uiState,
         onBack = onBack,
-        onClose = onClose,
         onConnect = { viewModel.onConnect() },
         onCancel = onClose,
     )
@@ -76,7 +75,6 @@ fun LnurlChannelScreen(
 private fun Content(
     uiState: LnurlChannelUiState,
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
     onConnect: () -> Unit = {},
     onCancel: () -> Unit = {},
 ) {
@@ -84,7 +82,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.other__lnurl_channel_header),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/HomeNav.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/HomeNav.kt
index 6dc64fabd..74d4507d3 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/HomeNav.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/HomeNav.kt
@@ -3,11 +3,8 @@ package to.bitkit.ui.screens.wallets
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.DrawerState
-import androidx.compose.material3.DrawerValue
-import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
@@ -18,16 +15,13 @@ import androidx.navigation.compose.rememberNavController
 import dev.chrisbanes.haze.hazeSource
 import dev.chrisbanes.haze.rememberHazeState
 import kotlinx.serialization.Serializable
-import to.bitkit.ui.components.DrawerMenu
 import to.bitkit.ui.components.Sheet
-import to.bitkit.ui.components.TabBar
 import to.bitkit.ui.navigateToActivityItem
-import to.bitkit.ui.navigateToScanner
+import to.bitkit.ui.navigateToAllActivity
 import to.bitkit.ui.navigateToTransferSavingsAvailability
 import to.bitkit.ui.navigateToTransferSavingsIntro
 import to.bitkit.ui.navigateToTransferSpendingAmount
 import to.bitkit.ui.navigateToTransferSpendingIntro
-import to.bitkit.ui.screens.wallets.activity.AllActivityScreen
 import to.bitkit.ui.utils.RequestNotificationPermissions
 import to.bitkit.ui.utils.Transitions
 import to.bitkit.viewmodels.ActivityListViewModel
@@ -43,11 +37,9 @@ fun HomeNav(
     activityListViewModel: ActivityListViewModel,
     settingsViewModel: SettingsViewModel,
     rootNavController: NavController,
+    drawerState: DrawerState,
 ) {
     val uiState: MainUiState by walletViewModel.uiState.collectAsStateWithLifecycle()
-    val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
-    val hasSeenWidgetsIntro: Boolean by settingsViewModel.hasSeenWidgetsIntro.collectAsStateWithLifecycle()
-    val hasSeenShopIntro: Boolean by settingsViewModel.hasSeenShopIntro.collectAsStateWithLifecycle()
     val hazeState = rememberHazeState()
 
     RequestNotificationPermissions(
@@ -56,42 +48,22 @@ fun HomeNav(
         }
     )
 
+    val walletNavController = rememberNavController()
+
     Box(
-        modifier = Modifier.fillMaxSize()
+        modifier = Modifier
+            .fillMaxSize()
+            .hazeSource(hazeState)
     ) {
-        val walletNavController = rememberNavController()
-
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .hazeSource(hazeState)
-        ) {
-            NavContent(
-                walletNavController = walletNavController,
-                rootNavController = rootNavController,
-                mainUiState = uiState,
-                drawerState = drawerState,
-                settingsViewModel = settingsViewModel,
-                appViewModel = appViewModel,
-                walletViewModel = walletViewModel,
-                activityListViewModel = activityListViewModel,
-            )
-        }
-
-        TabBar(
-            hazeState = hazeState,
-            onSendClick = { appViewModel.showSheet(Sheet.Send()) },
-            onReceiveClick = { appViewModel.showSheet(Sheet.Receive) },
-            onScanClick = { rootNavController.navigateToScanner() },
-        )
-
-        DrawerMenu(
-            drawerState = drawerState,
+        NavContent(
             walletNavController = walletNavController,
             rootNavController = rootNavController,
-            hasSeenWidgetsIntro = hasSeenWidgetsIntro,
-            hasSeenShopIntro = hasSeenShopIntro,
-            modifier = Modifier.align(Alignment.TopEnd)
+            mainUiState = uiState,
+            drawerState = drawerState,
+            settingsViewModel = settingsViewModel,
+            appViewModel = appViewModel,
+            walletViewModel = walletViewModel,
+            activityListViewModel = activityListViewModel,
         )
     }
 }
@@ -134,7 +106,7 @@ private fun NavContent(
             SavingsWalletScreen(
                 isGeoBlocked = isGeoBlocked,
                 onchainActivities = onchainActivities.orEmpty(),
-                onAllActivityButtonClick = { walletNavController.navigate(HomeRoutes.AllActivity) },
+                onAllActivityButtonClick = { rootNavController.navigateToAllActivity() },
                 onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
                 onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive) },
                 onTransferToSpendingClick = {
@@ -156,7 +128,7 @@ private fun NavContent(
             SpendingWalletScreen(
                 uiState = mainUiState,
                 lightningActivities = lightningActivities.orEmpty(),
-                onAllActivityButtonClick = { walletNavController.navigate(HomeRoutes.AllActivity) },
+                onAllActivityButtonClick = { rootNavController.navigateToAllActivity() },
                 onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
                 onEmptyActivityRowClick = { appViewModel.showSheet(Sheet.Receive) },
                 onTransferToSavingsClick = {
@@ -169,19 +141,6 @@ private fun NavContent(
                 onBackClick = { walletNavController.popBackStack() },
             )
         }
-        composable<HomeRoutes.AllActivity>(
-            enterTransition = { Transitions.slideInHorizontally },
-            exitTransition = { Transitions.slideOutHorizontally },
-        ) {
-            AllActivityScreen(
-                viewModel = activityListViewModel,
-                onBack = {
-                    activityListViewModel.clearFilters()
-                    walletNavController.popBackStack()
-                },
-                onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
-            )
-        }
     }
 }
 
@@ -194,7 +153,4 @@ object HomeRoutes {
 
     @Serializable
     data object Spending
-
-    @Serializable
-    data object AllActivity
 }
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
index 2701817eb..c0417c0d0 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
@@ -90,6 +90,7 @@ import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.components.WalletBalanceView
 import to.bitkit.ui.currencyViewModel
 import to.bitkit.ui.navigateToActivityItem
+import to.bitkit.ui.navigateToAllActivity
 import to.bitkit.ui.navigateToTransferFunding
 import to.bitkit.ui.navigateToTransferIntro
 import to.bitkit.ui.scaffold.AppAlertDialog
@@ -482,7 +483,7 @@ private fun Content(
                     Spacer(modifier = Modifier.height(16.dp))
                     ActivityListSimple(
                         items = latestActivities,
-                        onAllActivityClick = { walletNavController.navigate(HomeRoutes.AllActivity) },
+                        onAllActivityClick = { rootNavController.navigateToAllActivity() },
                         onActivityItemClick = { rootNavController.navigateToActivityItem(it) },
                         onEmptyActivityRowClick = onClickEmptyActivityRow,
                     )
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt
index f4d68b8cf..5c39eab86 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt
@@ -66,7 +66,7 @@ import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.TagButton
 import to.bitkit.ui.components.Title
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.screens.wallets.activity.components.ActivityAddTagSheet
 import to.bitkit.ui.screens.wallets.activity.components.ActivityIcon
 import to.bitkit.ui.shared.modifiers.sheetHeight
@@ -119,7 +119,7 @@ fun ActivityDetailScreen(
             AppTopBar(
                 titleText = stringResource(item.getScreenTitleRes()),
                 onBackClick = onBackClick,
-                actions = { CloseNavIcon(onClick = onCloseClick) },
+                actions = { DrawerNavIcon() },
             )
             ActivityDetailContent(
                 item = item,
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 c93303fbf..371f81aed 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
@@ -51,7 +51,7 @@ import to.bitkit.ui.components.BodySSB
 import to.bitkit.ui.components.Caption13Up
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.screens.wallets.activity.components.ActivityIcon
 import to.bitkit.ui.shared.util.clickableAlpha
@@ -99,7 +99,7 @@ fun ActivityExploreScreen(
         AppTopBar(
             titleText = stringResource(item.getScreenTitleRes()),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onClick = onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         ActivityExploreContent(
             item = item,
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/AllActivityScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/AllActivityScreen.kt
index 917c7b5cd..c99a213f7 100644
--- a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/AllActivityScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/AllActivityScreen.kt
@@ -28,6 +28,7 @@ import to.bitkit.R
 import to.bitkit.ui.appViewModel
 import to.bitkit.ui.components.Sheet
 import to.bitkit.ui.scaffold.AppTopBar
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.screens.wallets.activity.components.ActivityListFilter
 import to.bitkit.ui.screens.wallets.activity.components.ActivityListGrouped
 import to.bitkit.ui.screens.wallets.activity.components.ActivityTab
@@ -97,7 +98,13 @@ private fun AllActivityScreenContent(
     Column(
         modifier = Modifier.screen()
     ) {
-        AppTopBar(stringResource(R.string.wallet__activity_all), onBackClick)
+        AppTopBar(
+            titleText = stringResource(R.string.wallet__activity_all),
+            onBackClick = onBackClick,
+            actions = {
+                DrawerNavIcon()
+            },
+        )
 
         ActivityListFilter(
             searchText = searchText,
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/AddWidgetsScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/AddWidgetsScreen.kt
index ec34b39e1..31ca28913 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/AddWidgetsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/AddWidgetsScreen.kt
@@ -12,13 +12,12 @@ import to.bitkit.R
 import to.bitkit.models.WidgetType
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 
 @Composable
 fun AddWidgetsScreen(
-    onClose: () -> Unit,
     onWidgetSelected: (WidgetType) -> Unit,
     fiatSymbol: String,
 ) {
@@ -26,7 +25,7 @@ fun AddWidgetsScreen(
         AppTopBar(
             titleText = stringResource(R.string.widgets__add),
             onBackClick = null,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -99,7 +98,6 @@ fun AddWidgetsScreen(
 private fun Preview() {
     AppThemeSurface {
         AddWidgetsScreen(
-            onClose = {},
             onWidgetSelected = {},
             fiatSymbol = "$"
         )
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/WidgetsIntroScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/WidgetsIntroScreen.kt
index ba7f26f44..a92100477 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/WidgetsIntroScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/WidgetsIntroScreen.kt
@@ -18,7 +18,7 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -26,14 +26,13 @@ import to.bitkit.ui.utils.withAccent
 
 @Composable
 fun WidgetsIntroScreen(
-    onClose: () -> Unit,
     onContinue: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = "",
             onBackClick = null,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -69,7 +68,6 @@ fun WidgetsIntroScreen(
 private fun Preview() {
     AppThemeSurface {
         WidgetsIntroScreen(
-            onClose = {},
             onContinue = {}
         )
     }
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 66817c08d..f551016b7 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
@@ -31,7 +31,7 @@ import to.bitkit.ui.components.BodySSB
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -41,7 +41,7 @@ fun BlocksEditScreen(
     blocksViewModel: BlocksViewModel,
     onClose: () -> Unit,
     onBack: () -> Unit,
-    navigatePreview: () -> Unit
+    navigatePreview: () -> Unit,
 ) {
     val customPreference by blocksViewModel.customPreferences.collectAsStateWithLifecycle()
     val currentBlock by blocksViewModel.currentBlock.collectAsStateWithLifecycle()
@@ -56,7 +56,6 @@ fun BlocksEditScreen(
     )
 
     BlocksEditContent(
-        onClose = onClose,
         onBack = onBack,
         blocksPreferences = customPreference,
         block = currentBlock ?: blockPlaceholder,
@@ -73,7 +72,6 @@ fun BlocksEditScreen(
 
 @Composable
 fun BlocksEditContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     onClickShowBlock: () -> Unit,
     onClickShowTime: () -> Unit,
@@ -92,7 +90,7 @@ fun BlocksEditContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__edit),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -206,7 +204,7 @@ private fun BlockEditOptionRow(
     value: String,
     isEnabled: Boolean,
     onClick: () -> Unit,
-    testTagPrefix: String
+    testTagPrefix: String,
 ) {
     Column {
         Row(
@@ -259,7 +257,6 @@ private fun BlockEditOptionRow(
 private fun Preview() {
     AppThemeSurface {
         BlocksEditContent(
-            onClose = {},
             onBack = {},
             onClickShowBlock = {},
             onClickShowTime = {},
@@ -287,7 +284,6 @@ private fun Preview() {
 private fun PreviewWithSomeOptionsEnabled() {
     AppThemeSurface {
         BlocksEditContent(
-            onClose = {},
             onBack = {},
             onClickShowBlock = {},
             onClickShowTime = {},
@@ -322,7 +318,6 @@ private fun PreviewWithSomeOptionsEnabled() {
 private fun PreviewWithAllDisabled() {
     AppThemeSurface {
         BlocksEditContent(
-            onClose = {},
             onBack = {},
             onClickShowBlock = {},
             onClickShowTime = {},
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 6f09d8bae..ce6f4308d 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
@@ -34,7 +34,7 @@ import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -88,7 +88,7 @@ fun BlocksPreviewContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt
index 4dab1b8f1..322609712 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/calculator/CalculatorPreviewScreen.kt
@@ -31,7 +31,7 @@ import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.screens.widgets.calculator.components.CalculatorCard
 import to.bitkit.ui.theme.AppThemeSurface
@@ -49,7 +49,6 @@ fun CalculatorPreviewScreen(
     val isCalculatorWidgetEnabled by viewModel.isCalculatorWidgetEnabled.collectAsStateWithLifecycle()
 
     CalculatorPreviewContent(
-        onClose = onClose,
         onBack = onBack,
         isCalculatorWidgetEnabled = isCalculatorWidgetEnabled,
         showWidgetTitles = showWidgetTitles,
@@ -67,7 +66,6 @@ fun CalculatorPreviewScreen(
 
 @Composable
 fun CalculatorPreviewContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     onClickDelete: () -> Unit,
     onClickSave: () -> Unit,
@@ -81,7 +79,7 @@ fun CalculatorPreviewContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -180,7 +178,6 @@ fun CalculatorPreviewContent(
 private fun Preview() {
     AppThemeSurface {
         CalculatorPreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = true,
             onClickDelete = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsEditScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsEditScreen.kt
index 74baa709a..9d26c4b6a 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsEditScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsEditScreen.kt
@@ -29,7 +29,7 @@ import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.Title
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -37,15 +37,13 @@ import to.bitkit.ui.theme.Colors
 @Composable
 fun FactsEditScreen(
     factsViewModel: FactsViewModel,
-    onClose: () -> Unit,
     onBack: () -> Unit,
-    navigatePreview: () -> Unit
+    navigatePreview: () -> Unit,
 ) {
     val customPreference by factsViewModel.customPreferences.collectAsStateWithLifecycle()
     val fact by factsViewModel.currentFact.collectAsStateWithLifecycle()
 
     FactsEditContent(
-        onClose = onClose,
         onBack = onBack,
         factsPreferences = customPreference,
         fact = fact,
@@ -61,13 +59,12 @@ fun FactsEditScreen(
 
 @Composable
 fun FactsEditContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     onClickReset: () -> Unit,
     onClickShowSource: () -> Unit,
     onClickPreview: () -> Unit,
     factsPreferences: FactsPreferences,
-    fact: String
+    fact: String,
 ) {
     ScreenColumn(
         modifier = Modifier.testTag("facts_edit_screen")
@@ -75,7 +72,7 @@ fun FactsEditContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__edit),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -209,7 +206,6 @@ fun FactsEditContent(
 private fun Preview() {
     AppThemeSurface {
         FactsEditContent(
-            onClose = {},
             onBack = {},
             onClickShowSource = {},
             onClickReset = {},
@@ -225,7 +221,6 @@ private fun Preview() {
 private fun Preview2() {
     AppThemeSurface {
         FactsEditContent(
-            onClose = {},
             onBack = {},
             onClickShowSource = {},
             onClickReset = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsPreviewScreen.kt
index ab1d18216..3007611a7 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsPreviewScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/facts/FactsPreviewScreen.kt
@@ -33,7 +33,7 @@ import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -51,7 +51,6 @@ fun FactsPreviewScreen(
     val isFactsWidgetEnabled by factsViewModel.isFactsWidgetEnabled.collectAsStateWithLifecycle()
 
     FactsPreviewContent(
-        onClose = onClose,
         onBack = onBack,
         isFactsWidgetEnabled = isFactsWidgetEnabled,
         factsPreferences = customFactsPreferences,
@@ -71,7 +70,6 @@ fun FactsPreviewScreen(
 
 @Composable
 fun FactsPreviewContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     onClickEdit: () -> Unit,
     onClickDelete: () -> Unit,
@@ -79,7 +77,7 @@ fun FactsPreviewContent(
     showWidgetTitles: Boolean,
     isFactsWidgetEnabled: Boolean,
     factsPreferences: FactsPreferences,
-    fact: String
+    fact: String,
 ) {
     ScreenColumn(
         modifier = Modifier.testTag("facts_preview_screen")
@@ -87,7 +85,7 @@ fun FactsPreviewContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -200,7 +198,6 @@ fun FactsPreviewContent(
 private fun Preview() {
     AppThemeSurface {
         FactsPreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = true,
             onClickEdit = {},
@@ -218,7 +215,6 @@ private fun Preview() {
 private fun Preview2() {
     AppThemeSurface {
         FactsPreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = false,
             onClickEdit = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesEditScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesEditScreen.kt
index 967e6ad52..0ed17805e 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesEditScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesEditScreen.kt
@@ -30,7 +30,7 @@ import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.Title
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -38,7 +38,6 @@ import to.bitkit.ui.theme.Colors
 @Composable
 fun HeadlinesEditScreen(
     headlinesViewModel: HeadlinesViewModel,
-    onClose: () -> Unit,
     onBack: () -> Unit,
     navigatePreview: () -> Unit
 ) {
@@ -46,7 +45,6 @@ fun HeadlinesEditScreen(
     val article by headlinesViewModel.currentArticle.collectAsStateWithLifecycle()
 
     HeadlinesEditContent(
-        onClose = onClose,
         onBack = onBack,
         headlinePreferences = customHeadlinePreferences,
         article = article,
@@ -67,7 +65,6 @@ fun HeadlinesEditScreen(
 
 @Composable
 fun HeadlinesEditContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     onClickTime: () -> Unit,
     onClickReset: () -> Unit,
@@ -82,7 +79,7 @@ fun HeadlinesEditContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__edit),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -248,7 +245,6 @@ fun HeadlinesEditContent(
 private fun Preview() {
     AppThemeSurface {
         HeadlinesEditContent(
-            onClose = {},
             onBack = {},
             onClickShowSource = {},
             onClickTime = {},
@@ -270,7 +266,6 @@ private fun Preview() {
 private fun Preview2() {
     AppThemeSurface {
         HeadlinesEditContent(
-            onClose = {},
             onBack = {},
             onClickShowSource = {},
             onClickTime = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesPreviewScreen.kt
index 9c219793f..308e7a3ce 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesPreviewScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/headlines/HeadlinesPreviewScreen.kt
@@ -34,7 +34,7 @@ import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -52,7 +52,6 @@ fun HeadlinesPreviewScreen(
     val isHeadlinesImplemented by headlinesViewModel.isNewsWidgetEnabled.collectAsStateWithLifecycle()
 
     HeadlinesPreviewContent(
-        onClose = onClose,
         onBack = onBack,
         isHeadlinesImplemented = isHeadlinesImplemented,
         headlinePreferences = customHeadlinePreferences,
@@ -72,7 +71,6 @@ fun HeadlinesPreviewScreen(
 
 @Composable
 fun HeadlinesPreviewContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     onClickEdit: () -> Unit,
     onClickDelete: () -> Unit,
@@ -80,7 +78,7 @@ fun HeadlinesPreviewContent(
     showWidgetTitles: Boolean,
     isHeadlinesImplemented: Boolean,
     headlinePreferences: HeadlinePreferences,
-    article: ArticleModel
+    article: ArticleModel,
 ) {
     ScreenColumn(
         modifier = Modifier.testTag("headlines_preview_screen")
@@ -88,7 +86,7 @@ fun HeadlinesPreviewContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -205,7 +203,6 @@ fun HeadlinesPreviewContent(
 private fun Preview() {
     AppThemeSurface {
         HeadlinesPreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = true,
             onClickEdit = {},
@@ -228,7 +225,6 @@ private fun Preview() {
 private fun Preview2() {
     AppThemeSurface {
         HeadlinesPreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = false,
             onClickEdit = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/price/PriceEditScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/price/PriceEditScreen.kt
index 8592841b6..3d8ece8ef 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/price/PriceEditScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/price/PriceEditScreen.kt
@@ -33,14 +33,13 @@ import to.bitkit.ui.components.BodySSB
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.Colors
 
 @Composable
 fun PriceEditScreen(
     viewModel: PriceViewModel,
-    onClose: () -> Unit,
     onBack: () -> Unit,
     navigatePreview: () -> Unit
 ) {
@@ -50,7 +49,6 @@ fun PriceEditScreen(
     val isLoading by viewModel.isLoading.collectAsStateWithLifecycle()
 
     PriceEditContent(
-        onClose = onClose,
         onBack = onBack,
         preferences = customPreferences,
         onClickReset = { viewModel.resetCustomPreferences() },
@@ -75,7 +73,6 @@ fun PriceEditScreen(
 
 @Composable
 fun PriceEditContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     priceModel: PriceDTO,
     allPeriodsUsd: List<PriceWidgetData>,
@@ -93,7 +90,7 @@ fun PriceEditContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__edit),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/price/PricePreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/price/PricePreviewScreen.kt
index 2b7ce8bc7..1d2322900 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/price/PricePreviewScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/price/PricePreviewScreen.kt
@@ -41,7 +41,7 @@ import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -69,7 +69,6 @@ fun PricePreviewScreen(
     }
 
     PricePreviewContent(
-        onClose = onClose,
         onBack = onBack,
         isPriceWidgetEnabled = isPriceWidgetEnabled,
         pricePreferences = customPricePreferences,
@@ -89,7 +88,6 @@ fun PricePreviewScreen(
 
 @Composable
 fun PricePreviewContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     onClickEdit: () -> Unit,
     onClickDelete: () -> Unit,
@@ -98,7 +96,7 @@ fun PricePreviewContent(
     isPriceWidgetEnabled: Boolean,
     pricePreferences: PricePreferences,
     priceDTO: PriceDTO?,
-    isLoading: Boolean
+    isLoading: Boolean,
 ) {
     ScreenColumn(
         modifier = Modifier.testTag("price_preview_screen")
@@ -106,7 +104,7 @@ fun PricePreviewContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -224,7 +222,6 @@ fun PricePreviewContent(
 private fun Preview() {
     AppThemeSurface {
         PricePreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = true,
             onClickEdit = {},
@@ -267,7 +264,6 @@ private fun Preview() {
 private fun Preview2() {
     AppThemeSurface {
         PricePreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = false,
             onClickEdit = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherEditScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherEditScreen.kt
index 3239c9a96..ac545d2c0 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherEditScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherEditScreen.kt
@@ -36,7 +36,7 @@ import to.bitkit.ui.components.BodySSB
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.screens.widgets.blocks.WeatherModel
 import to.bitkit.ui.theme.AppThemeSurface
@@ -46,15 +46,13 @@ import to.bitkit.ui.theme.InterFontFamily
 @Composable
 fun WeatherEditScreen(
     weatherViewModel: WeatherViewModel,
-    onClose: () -> Unit,
     onBack: () -> Unit,
-    navigatePreview: () -> Unit
+    navigatePreview: () -> Unit,
 ) {
     val customPreferences by weatherViewModel.customPreferences.collectAsStateWithLifecycle()
     val currentWeather by weatherViewModel.currentWeather.collectAsStateWithLifecycle()
 
     WeatherEditContent(
-        onClose = onClose,
         onBack = onBack,
         weatherPreferences = customPreferences,
         onClickShowTitle = { weatherViewModel.toggleShowTitle() },
@@ -69,7 +67,6 @@ fun WeatherEditScreen(
 
 @Composable
 fun WeatherEditContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     weather: WeatherModel?,
     onClickShowTitle: () -> Unit,
@@ -86,7 +83,7 @@ fun WeatherEditContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__edit),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -129,7 +126,9 @@ fun WeatherEditContent(
                         fontFamily = InterFontFamily,
                         color = Colors.White,
                     ),
-                    modifier = Modifier.weight(1f).testTag("title_text"),
+                    modifier = Modifier
+                        .weight(1f)
+                        .testTag("title_text"),
                 )
 
                 weather?.icon?.let {
@@ -176,7 +175,9 @@ fun WeatherEditContent(
                 BodyM(
                     text = weather?.description?.let { stringResource(it) }.orEmpty(),
                     color = Colors.White,
-                    modifier = Modifier.weight(1f).testTag("description_text")
+                    modifier = Modifier
+                        .weight(1f)
+                        .testTag("description_text")
                 )
 
                 IconButton(
@@ -255,7 +256,7 @@ private fun WeatherEditOptionRow(
     value: String,
     isEnabled: Boolean,
     onClick: () -> Unit,
-    testTagPrefix: String
+    testTagPrefix: String,
 ) {
     Column {
         Row(
@@ -308,7 +309,6 @@ private fun WeatherEditOptionRow(
 private fun Preview() {
     AppThemeSurface {
         WeatherEditContent(
-            onClose = {},
             onBack = {},
             onClickShowTitle = {},
             onClickShowDescription = {},
@@ -333,7 +333,6 @@ private fun Preview() {
 private fun PreviewWithSomeOptionsEnabled() {
     AppThemeSurface {
         WeatherEditContent(
-            onClose = {},
             onBack = {},
             onClickShowTitle = {},
             onClickShowDescription = {},
@@ -363,7 +362,6 @@ private fun PreviewWithSomeOptionsEnabled() {
 private fun PreviewWithAllDisabled() {
     AppThemeSurface {
         WeatherEditContent(
-            onClose = {},
             onBack = {},
             onClickShowTitle = {},
             onClickShowDescription = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherPreviewScreen.kt b/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherPreviewScreen.kt
index cff65e70a..8f89c5451 100644
--- a/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherPreviewScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/screens/widgets/weather/WeatherPreviewScreen.kt
@@ -35,7 +35,7 @@ import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.screens.widgets.blocks.WeatherModel
 import to.bitkit.ui.theme.AppThemeSurface
@@ -54,7 +54,6 @@ fun WeatherPreviewScreen(
     val isWeatherWidgetEnabled by weatherViewModel.isWeatherWidgetEnabled.collectAsStateWithLifecycle()
 
     WeatherPreviewContent(
-        onClose = onClose,
         onBack = onBack,
         isWeatherWidgetEnabled = isWeatherWidgetEnabled,
         weatherPreferences = customWeatherPreferences,
@@ -74,7 +73,6 @@ fun WeatherPreviewScreen(
 
 @Composable
 fun WeatherPreviewContent(
-    onClose: () -> Unit,
     onBack: () -> Unit,
     onClickEdit: () -> Unit,
     onClickDelete: () -> Unit,
@@ -90,7 +88,7 @@ fun WeatherPreviewContent(
         AppTopBar(
             titleText = stringResource(R.string.widgets__widget__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -207,7 +205,6 @@ fun WeatherPreviewContent(
 private fun Preview() {
     AppThemeSurface {
         WeatherPreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = true,
             onClickEdit = {},
@@ -231,7 +228,6 @@ private fun Preview() {
 private fun Preview2() {
     AppThemeSurface {
         WeatherPreviewContent(
-            onClose = {},
             onBack = {},
             showWidgetTitles = false,
             onClickEdit = {},
diff --git a/app/src/main/java/to/bitkit/ui/settings/AboutScreen.kt b/app/src/main/java/to/bitkit/ui/settings/AboutScreen.kt
index 8e57ba882..c2ee445a2 100644
--- a/app/src/main/java/to/bitkit/ui/settings/AboutScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/AboutScreen.kt
@@ -25,7 +25,7 @@ import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.components.settings.Links
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.shared.util.shareText
 import to.bitkit.ui.theme.AppThemeSurface
@@ -34,7 +34,6 @@ import to.bitkit.ui.theme.Colors
 @Composable
 fun AboutScreen(
     onBack: () -> Unit,
-    onClose: () -> Unit,
 ) {
     val context = LocalContext.current
 
@@ -42,7 +41,7 @@ fun AboutScreen(
         AppTopBar(
             titleText = stringResource(R.string.settings__about__title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -105,7 +104,6 @@ private fun Preview() {
     AppThemeSurface {
         AboutScreen(
             onBack = {},
-            onClose = {}
         )
     }
 }
diff --git a/app/src/main/java/to/bitkit/ui/settings/AdvancedSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/AdvancedSettingsScreen.kt
index 378034d18..d8c7917b0 100644
--- a/app/src/main/java/to/bitkit/ui/settings/AdvancedSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/AdvancedSettingsScreen.kt
@@ -25,7 +25,7 @@ import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppAlertDialog
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 
@@ -39,7 +39,6 @@ fun AdvancedSettingsScreen(
     Content(
         showResetSuggestionsDialog = showResetSuggestionsDialog,
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
         onCoinSelectionClick = {
             navController.navigate(Routes.CoinSelectPreference)
         },
@@ -72,7 +71,6 @@ fun AdvancedSettingsScreen(
 private fun Content(
     showResetSuggestionsDialog: Boolean,
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
     onCoinSelectionClick: () -> Unit = {},
     onLightningConnectionsClick: () -> Unit = {},
     onLightningNodeClick: () -> Unit = {},
@@ -87,7 +85,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.settings__advanced_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClose) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
diff --git a/app/src/main/java/to/bitkit/ui/settings/BackupSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/BackupSettingsScreen.kt
index 99962eafa..969c60bbb 100644
--- a/app/src/main/java/to/bitkit/ui/settings/BackupSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/BackupSettingsScreen.kt
@@ -43,9 +43,8 @@ import to.bitkit.ui.components.Sheet
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.navigateToAuthCheck
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.shared.util.clickableAlpha
@@ -78,7 +77,6 @@ fun BackupSettingsScreen(
         },
         onRetryBackup = { category -> viewModel.retryBackup(category) },
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
     )
 }
 
@@ -89,14 +87,13 @@ private fun BackupSettingsScreenContent(
     onResetAndRestoreClick: () -> Unit,
     onRetryBackup: (BackupCategory) -> Unit,
     onBack: () -> Unit,
-    onClose: () -> Unit,
 ) {
     val allSynced = uiState.categories.all { !it.status.isRequired }
     ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.settings__backup__title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
@@ -166,6 +163,7 @@ private fun BackupStatusItem(
         status.running -> stringResource(R.string.settings__backup__status_running)
         !status.isRequired -> stringResource(R.string.settings__backup__status_success)
             .replace("{time}", timeString)
+
         else -> stringResource(R.string.settings__backup__status_failed)
             .replace("{time}", timeString)
     }
@@ -269,7 +267,6 @@ private fun Preview() {
             onResetAndRestoreClick = {},
             onRetryBackup = {},
             onBack = {},
-            onClose = {},
         )
     }
 }
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 78683a944..c16bd4e42 100644
--- a/app/src/main/java/to/bitkit/ui/settings/BlocktankRegtestScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/BlocktankRegtestScreen.kt
@@ -37,7 +37,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.walletViewModel
@@ -57,7 +57,7 @@ fun BlocktankRegtestScreen(
         AppTopBar(
             titleText = "Blocktank Regtest",
             onBackClick = { navController.popBackStack() },
-            actions = { CloseNavIcon(onClick = { navController.navigateToHome() }) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             verticalArrangement = Arrangement.spacedBy(8.dp),
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 da7df17b0..f8a7b7a35 100644
--- a/app/src/main/java/to/bitkit/ui/settings/LanguageSettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/LanguageSettingsScreen.kt
@@ -17,7 +17,7 @@ import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.shared.util.screen
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -58,7 +58,7 @@ private fun Content(
         AppTopBar(
             titleText = "Language", // TODO Transifex
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onClick = onCloseClick) }
+            actions = { DrawerNavIcon() }
         )
 
         Column(
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 51fa26597..66a8ef7ad 100644
--- a/app/src/main/java/to/bitkit/ui/settings/SecuritySettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/SecuritySettingsScreen.kt
@@ -26,7 +26,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.theme.AppThemeSurface
@@ -141,7 +141,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.settings__security_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onClick = onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier.padding(horizontal = 16.dp)
diff --git a/app/src/main/java/to/bitkit/ui/settings/SettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/SettingsScreen.kt
index 4a4b857b3..490fd3da6 100644
--- a/app/src/main/java/to/bitkit/ui/settings/SettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/SettingsScreen.kt
@@ -37,7 +37,7 @@ import to.bitkit.ui.navigateToDevSettings
 import to.bitkit.ui.navigateToGeneralSettings
 import to.bitkit.ui.navigateToSecuritySettings
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.shared.util.clickableAlpha
@@ -58,7 +58,6 @@ fun SettingsScreen(
 
     SettingsScreenContent(
         isDevModeEnabled = isDevModeEnabled,
-        onClose = { navController.popBackStack() },
         onGeneralClick = { navController.navigateToGeneralSettings() },
         onSecurityClick = { navController.navigateToSecuritySettings() },
         onBackupClick = { navController.navigateToBackupSettings() },
@@ -93,7 +92,6 @@ fun SettingsScreen(
 @Composable
 fun SettingsScreenContent(
     isDevModeEnabled: Boolean,
-    onClose: () -> Unit,
     onGeneralClick: () -> Unit,
     onSecurityClick: () -> Unit,
     onBackupClick: () -> Unit,
@@ -107,7 +105,7 @@ fun SettingsScreenContent(
         AppTopBar(
             titleText = stringResource(R.string.settings__settings),
             onBackClick = null,
-            actions = { CloseNavIcon(onClose) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
@@ -180,7 +178,6 @@ private fun Preview() {
     AppThemeSurface {
         SettingsScreenContent(
             isDevModeEnabled = true,
-            onClose = {},
             onGeneralClick = {},
             onSecurityClick = {},
             onBackupClick = {},
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 302084d41..91cf39b04 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
@@ -44,7 +44,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.theme.AppShapes
@@ -66,7 +66,6 @@ fun AddressViewerScreen(
     AddressViewerContent(
         uiState = uiState,
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
         onSearchTextChanged = viewModel::updateSearchText,
         onAddressSelected = { address -> viewModel.selectAddress(address) },
         onSwitchAddressType = viewModel::switchAddressType,
@@ -92,7 +91,6 @@ fun AddressViewerScreen(
 private fun AddressViewerContent(
     uiState: UiState,
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
     onSearchTextChanged: (String) -> Unit = {},
     onAddressSelected: (AddressModel) -> Unit = {},
     onSwitchAddressType: (Boolean) -> Unit = {},
@@ -105,7 +103,7 @@ private fun AddressViewerContent(
         AppTopBar(
             titleText = stringResource(R.string.settings__adv__address_viewer),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
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 688f129d6..19fac051f 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
@@ -22,7 +22,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 
@@ -47,7 +47,6 @@ fun CoinSelectPreferenceScreen(
     Content(
         uiState = uiState,
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
         onClickManual = { viewModel.setAutoMode(false) },
         onClickAutopilot = { viewModel.setAutoMode(true) },
         onClickCoinSelectionPreference = { preference -> viewModel.setCoinSelectionPreference(preference) },
@@ -58,7 +57,6 @@ fun CoinSelectPreferenceScreen(
 private fun Content(
     uiState: CoinSelectPreferenceUiState,
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
     onClickManual: () -> Unit = {},
     onClickAutopilot: () -> Unit = {},
     onClickCoinSelectionPreference: (CoinSelectionPreference) -> Unit = {},
@@ -67,7 +65,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.settings__adv__coin_selection),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClose) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 bb79f86bc..e402eefcf 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
@@ -41,7 +41,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.theme.AppThemeSurface
@@ -59,7 +59,6 @@ fun AppStatusScreen(
     Content(
         uiState = uiState,
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
         onInternetClick = { context.startActivityAppSettings() },
         onElectrumClick = { navController.navigate(Routes.ElectrumConfig) },
         onNodeClick = { navController.navigate(Routes.NodeInfo) },
@@ -72,7 +71,6 @@ fun AppStatusScreen(
 private fun Content(
     uiState: AppStatusUiState = AppStatusUiState(),
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
     onInternetClick: () -> Unit = {},
     onElectrumClick: () -> Unit = {},
     onNodeClick: () -> Unit = {},
@@ -83,7 +81,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.settings__status__title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
diff --git a/app/src/main/java/to/bitkit/ui/settings/backgroundPayments/BackgroundPaymentsIntroScreen.kt b/app/src/main/java/to/bitkit/ui/settings/backgroundPayments/BackgroundPaymentsIntroScreen.kt
index 1fcea8362..01b15e798 100644
--- a/app/src/main/java/to/bitkit/ui/settings/backgroundPayments/BackgroundPaymentsIntroScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/backgroundPayments/BackgroundPaymentsIntroScreen.kt
@@ -18,7 +18,7 @@ import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.shared.util.screen
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -28,7 +28,6 @@ import to.bitkit.viewmodels.SettingsViewModel
 @Composable
 fun BackgroundPaymentsIntroScreen(
     onBack: () -> Unit,
-    onClose: () -> Unit,
     onContinue: () -> Unit,
     modifier: Modifier = Modifier,
     settingsViewModel: SettingsViewModel = hiltViewModel(),
@@ -39,7 +38,7 @@ fun BackgroundPaymentsIntroScreen(
         AppTopBar(
             titleText = "Background Payments", // Todo Transifex
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
         BackgroundPaymentsIntroContent(
             onContinue = {
diff --git a/app/src/main/java/to/bitkit/ui/settings/backgroundPayments/BackgroundPaymentsSettings.kt b/app/src/main/java/to/bitkit/ui/settings/backgroundPayments/BackgroundPaymentsSettings.kt
index 2ebd7aa59..257ced12b 100644
--- a/app/src/main/java/to/bitkit/ui/settings/backgroundPayments/BackgroundPaymentsSettings.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/backgroundPayments/BackgroundPaymentsSettings.kt
@@ -25,7 +25,7 @@ import to.bitkit.ui.components.settings.SettingsButtonRow
 import to.bitkit.ui.components.settings.SettingsButtonValue
 import to.bitkit.ui.components.settings.SettingsSwitchRow
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.shared.util.screen
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -36,7 +36,6 @@ import to.bitkit.viewmodels.SettingsViewModel
 @Composable
 fun BackgroundPaymentsSettings(
     onBack: () -> Unit,
-    onClose: () -> Unit,
     settingsViewModel: SettingsViewModel = hiltViewModel(),
 ) {
     val context = LocalContext.current
@@ -52,7 +51,6 @@ fun BackgroundPaymentsSettings(
 
     Content(
         onBack = onBack,
-        onClose = onClose,
         onSystemSettingsClick = {
             NotificationUtils.openNotificationSettings(context)
         },
@@ -65,7 +63,6 @@ fun BackgroundPaymentsSettings(
 @Composable
 private fun Content(
     onBack: () -> Unit,
-    onClose: () -> Unit,
     onSystemSettingsClick: () -> Unit,
     toggleNotificationDetails: () -> Unit,
     hasPermission: Boolean,
@@ -77,7 +74,7 @@ private fun Content(
         AppTopBar(
             titleText = "Background Payments",
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -159,7 +156,6 @@ private fun Preview1() {
     AppThemeSurface {
         Content(
             onBack = {},
-            onClose = {},
             onSystemSettingsClick = {},
             toggleNotificationDetails = {},
             hasPermission = true,
@@ -174,7 +170,6 @@ private fun Preview2() {
     AppThemeSurface {
         Content(
             onBack = {},
-            onClose = {},
             onSystemSettingsClick = {},
             toggleNotificationDetails = {},
             hasPermission = false,
diff --git a/app/src/main/java/to/bitkit/ui/settings/backups/ResetAndRestoreScreen.kt b/app/src/main/java/to/bitkit/ui/settings/backups/ResetAndRestoreScreen.kt
index fd2c43950..e9b83d1fc 100644
--- a/app/src/main/java/to/bitkit/ui/settings/backups/ResetAndRestoreScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/backups/ResetAndRestoreScreen.kt
@@ -30,10 +30,9 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.Sheet
-import to.bitkit.ui.navigateToHome
 import to.bitkit.ui.scaffold.AppAlertDialog
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -61,7 +60,6 @@ fun ResetAndRestoreScreen(
         onResetConfirm = { wallet.wipeWallet() },
         onResetDismiss = { showDialog = false },
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
     )
 }
 
@@ -73,13 +71,12 @@ private fun Content(
     onResetConfirm: () -> Unit,
     onResetDismiss: () -> Unit,
     onBack: () -> Unit,
-    onClose: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.security__reset_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
         Spacer(Modifier.height(32.dp))
 
@@ -151,7 +148,6 @@ private fun Preview() {
             onResetConfirm = {},
             onResetDismiss = {},
             onBack = {},
-            onClose = {},
         )
     }
 }
@@ -167,7 +163,6 @@ private fun Preview2() {
             onResetConfirm = {},
             onResetDismiss = {},
             onBack = {},
-            onClose = {},
         )
     }
 }
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 850bddce1..1c5eae96d 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
@@ -23,7 +23,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.viewmodels.CurrencyViewModel
@@ -60,7 +60,7 @@ fun DefaultUnitSettingsScreenContent(
         AppTopBar(
             titleText = stringResource(R.string.settings__general__unit_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
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 f4a002cd4..f373a7bde 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
@@ -33,7 +33,7 @@ import to.bitkit.ui.navigateToTagsSettings
 import to.bitkit.ui.navigateToTransactionSpeedSettings
 import to.bitkit.ui.navigateToWidgetsSettings
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.theme.AppThemeSurface
@@ -104,7 +104,7 @@ private fun GeneralSettingsContent(
         AppTopBar(
             titleText = stringResource(R.string.settings__general_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onClick = onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
diff --git a/app/src/main/java/to/bitkit/ui/settings/general/LocalCurrencySettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/general/LocalCurrencySettingsScreen.kt
index 3b04ba84a..6f887099d 100644
--- a/app/src/main/java/to/bitkit/ui/settings/general/LocalCurrencySettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/general/LocalCurrencySettingsScreen.kt
@@ -24,9 +24,8 @@ import to.bitkit.ui.components.SearchInput
 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -76,7 +75,6 @@ fun LocalCurrencySettingsScreen(
         selectedCurrency = selectedCurrency,
         onCurrencyClick = { currencyViewModel.setSelectedCurrency(it) },
         onBackClick = { navController.popBackStack() },
-        onCloseClick = navController::navigateToHome,
     )
 }
 
@@ -89,13 +87,12 @@ fun LocalCurrencySettingsContent(
     selectedCurrency: String,
     onCurrencyClick: (String) -> Unit,
     onBackClick: () -> Unit,
-    onCloseClick: () -> Unit,
 ) {
     ScreenColumn {
         AppTopBar(
             titleText = stringResource(R.string.settings__general__currency_local_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -219,7 +216,6 @@ private fun Preview() {
             selectedCurrency = "USD",
             onCurrencyClick = {},
             onBackClick = {},
-            onCloseClick = {},
         )
     }
 }
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 8fc26bd32..13686db0f 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
@@ -19,7 +19,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.theme.AppThemeSurface
@@ -56,7 +56,7 @@ private fun TagsSettingsContent(
         AppTopBar(
             titleText = stringResource(R.string.settings__general__tags),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier.padding(horizontal = 16.dp),
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 e95451c3e..249b628d8 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
@@ -14,7 +14,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.theme.AppThemeSurface
@@ -51,7 +51,7 @@ private fun WidgetsSettingsContent(
         AppTopBar(
             titleText = stringResource(R.string.settings__widgets__nav_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier.padding(horizontal = 16.dp),
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 371edfdb2..b01c81020 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
@@ -69,7 +69,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settings.lightning.components.ChannelStatusView
 import to.bitkit.ui.shared.util.clickableAlpha
@@ -117,7 +117,6 @@ fun ChannelDetailScreen(
         isRefreshing = uiState.isRefreshing,
         isClosedChannel = isClosedChannel,
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
         onRefresh = {
             viewModel.onPullToRefresh()
         },
@@ -150,7 +149,6 @@ private fun Content(
     isRefreshing: Boolean = false,
     isClosedChannel: Boolean = false,
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
     onRefresh: () -> Unit = {},
     onCopyText: (String) -> Unit = {},
     onOpenUrl: (String) -> Unit = {},
@@ -184,7 +182,7 @@ private fun Content(
         AppTopBar(
             titleText = channel.name,
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         PullToRefreshBox(
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 116c531f9..bfe161274 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
@@ -31,7 +31,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -75,7 +75,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.lightning__close_conn),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClose) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 586d40ac2..68da176b9 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
@@ -33,7 +33,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -91,7 +91,7 @@ private fun ChangePinConfirmContent(
         AppTopBar(
             titleText = stringResource(R.string.security__cp_retype_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onClick = onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
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 d1542da9f..d8ac7179b 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
@@ -27,7 +27,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -73,7 +73,7 @@ private fun ChangePinNewContent(
         AppTopBar(
             titleText = stringResource(R.string.security__cp_setnew_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onClick = onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
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 1a1a5b35a..2baf17be5 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
@@ -32,7 +32,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.shared.util.clickableAlpha
 import to.bitkit.ui.theme.AppThemeSurface
@@ -91,7 +91,7 @@ private fun ChangePinContent(
         AppTopBar(
             titleText = stringResource(R.string.security__cp_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onClick = onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
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 6f6617a9b..e855beed0 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
@@ -26,7 +26,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -58,7 +58,7 @@ private fun DisablePinContent(
         AppTopBar(
             titleText = stringResource(R.string.security__pin_disable_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onClick = onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier.padding(horizontal = 16.dp),
diff --git a/app/src/main/java/to/bitkit/ui/settings/quickPay/QuickPayIntroScreen.kt b/app/src/main/java/to/bitkit/ui/settings/quickPay/QuickPayIntroScreen.kt
index cb090561b..c514c439b 100644
--- a/app/src/main/java/to/bitkit/ui/settings/quickPay/QuickPayIntroScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/quickPay/QuickPayIntroScreen.kt
@@ -17,7 +17,7 @@ import to.bitkit.ui.components.Display
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.VerticalSpacer
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.shared.util.screen
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -26,7 +26,6 @@ import to.bitkit.ui.utils.withAccent
 @Composable
 fun QuickPayIntroScreen(
     onBack: () -> Unit,
-    onClose: () -> Unit,
     onContinue: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -36,7 +35,7 @@ fun QuickPayIntroScreen(
         AppTopBar(
             titleText = stringResource(R.string.settings__quickpay__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         QuickPayIntroContent(onContinue = onContinue)
@@ -81,7 +80,6 @@ private fun Preview() {
     AppThemeSurface {
         QuickPayIntroScreen(
             onBack = {},
-            onClose = {},
             onContinue = {}
         )
     }
diff --git a/app/src/main/java/to/bitkit/ui/settings/quickPay/QuickPaySettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/quickPay/QuickPaySettingsScreen.kt
index 27b596f1b..5978da09d 100644
--- a/app/src/main/java/to/bitkit/ui/settings/quickPay/QuickPaySettingsScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/quickPay/QuickPaySettingsScreen.kt
@@ -24,7 +24,7 @@ import to.bitkit.ui.components.Caption13Up
 import to.bitkit.ui.components.StepSlider
 import to.bitkit.ui.components.settings.SettingsSwitchRow
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -33,7 +33,6 @@ import to.bitkit.viewmodels.SettingsViewModel
 @Composable
 fun QuickPaySettingsScreen(
     onBack: () -> Unit,
-    onClose: () -> Unit,
     settingsViewModel: SettingsViewModel = hiltViewModel(),
 ) {
     val isQuickPayEnabled by settingsViewModel.isQuickpayEnabled.collectAsStateWithLifecycle()
@@ -45,7 +44,6 @@ fun QuickPaySettingsScreen(
         onToggleQuickPay = settingsViewModel::setIsQuickPayEnabled,
         onQuickPayAmountChange = settingsViewModel::setQuickPayAmount,
         onBack = onBack,
-        onClose = onClose,
     )
 }
 
@@ -56,7 +54,6 @@ fun QuickPaySettingsScreenContent(
     onToggleQuickPay: (Boolean) -> Unit = {},
     onQuickPayAmountChange: (Int) -> Unit = {},
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
 ) {
     val sliderSteps = remember { listOf(1, 5, 10, 20, 50) }
 
@@ -64,7 +61,7 @@ fun QuickPaySettingsScreenContent(
         AppTopBar(
             titleText = stringResource(R.string.settings__quickpay__nav_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
diff --git a/app/src/main/java/to/bitkit/ui/settings/support/ReportIssueResultScreen.kt b/app/src/main/java/to/bitkit/ui/settings/support/ReportIssueResultScreen.kt
index c5cff4c84..dae4e0682 100644
--- a/app/src/main/java/to/bitkit/ui/settings/support/ReportIssueResultScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/support/ReportIssueResultScreen.kt
@@ -16,7 +16,7 @@ import to.bitkit.R
 import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -35,7 +35,7 @@ fun ReportIssueResultScreen(
                 stringResource(R.string.settings__support__title_unsuccess)
             },
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
diff --git a/app/src/main/java/to/bitkit/ui/settings/support/ReportIssueScreen.kt b/app/src/main/java/to/bitkit/ui/settings/support/ReportIssueScreen.kt
index 7b05b9281..e4dc66b40 100644
--- a/app/src/main/java/to/bitkit/ui/settings/support/ReportIssueScreen.kt
+++ b/app/src/main/java/to/bitkit/ui/settings/support/ReportIssueScreen.kt
@@ -22,7 +22,7 @@ import to.bitkit.ui.components.BodyM
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.components.TextInput
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -43,7 +43,6 @@ object ReportIssueTestTags {
 fun ReportIssueScreen(
     viewModel: ReportIssueViewModel = hiltViewModel(),
     onBack: () -> Unit,
-    onClose: () -> Unit,
     navigateResultScreen: (Boolean) -> Unit,
 ) {
     LaunchedEffect(Unit) {
@@ -59,7 +58,6 @@ fun ReportIssueScreen(
 
     ReportIssueContent(
         onBack = onBack,
-        onClose = onClose,
         onConfirm = viewModel::sendMessage,
         onUpdateEmail = viewModel::updateEmail,
         onUpdateMessage = viewModel::updateMessage,
@@ -70,7 +68,6 @@ fun ReportIssueScreen(
 @Composable
 fun ReportIssueContent(
     onBack: () -> Unit,
-    onClose: () -> Unit,
     onConfirm: () -> Unit,
     onUpdateEmail: (String) -> Unit,
     onUpdateMessage: (String) -> Unit,
@@ -80,7 +77,7 @@ fun ReportIssueContent(
         AppTopBar(
             titleText = stringResource(R.string.settings__support__report),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
@@ -160,7 +157,6 @@ private fun Preview() {
     AppThemeSurface {
         ReportIssueContent(
             onBack = {},
-            onClose = {},
             onConfirm = {},
             onUpdateEmail = {},
             onUpdateMessage = {},
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 68bf36059..d82e48710 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
@@ -25,7 +25,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
@@ -38,7 +38,6 @@ fun SupportScreen(
 
     Content(
         onBack = { navController.popBackStack() },
-        onClose = { navController.navigateToHome() },
         onClickReportIssue = { navController.navigate(Routes.ReportIssue) },
         onClickHelpCenter = {
             val intent = Intent(Intent.ACTION_VIEW, Env.BITKIT_HELP_CENTER.toUri())
@@ -51,7 +50,6 @@ fun SupportScreen(
 @Composable
 private fun Content(
     onBack: () -> Unit = {},
-    onClose: () -> Unit = {},
     onClickReportIssue: () -> Unit = {},
     onClickHelpCenter: () -> Unit = {},
     onClickAppStatus: () -> Unit = {},
@@ -60,7 +58,7 @@ private fun Content(
         AppTopBar(
             titleText = stringResource(R.string.settings__support_title),
             onBackClick = onBack,
-            actions = { CloseNavIcon(onClick = onClose) },
+            actions = { DrawerNavIcon() },
         )
 
         Column(
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 e1f30cf8a..20d54bf5b 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
@@ -32,7 +32,7 @@ import to.bitkit.ui.components.NumberPadType
 import to.bitkit.ui.components.PrimaryButton
 import to.bitkit.ui.currencyViewModel
 import to.bitkit.ui.scaffold.AppTopBar
-import to.bitkit.ui.scaffold.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.theme.AppThemeSurface
@@ -106,7 +106,7 @@ private fun CustomFeeSettingsContent(
         AppTopBar(
             titleText = stringResource(R.string.settings__general__speed_fee_custom),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onClick = onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier
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 819e33773..7e166ab9f 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
@@ -20,7 +20,7 @@ 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.CloseNavIcon
+import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.settingsViewModel
 import to.bitkit.ui.theme.AppThemeSurface
@@ -59,7 +59,7 @@ private fun TransactionSpeedSettingsContent(
         AppTopBar(
             titleText = stringResource(R.string.settings__general__speed_title),
             onBackClick = onBackClick,
-            actions = { CloseNavIcon(onClick = onCloseClick) },
+            actions = { DrawerNavIcon() },
         )
         Column(
             modifier = Modifier.padding(horizontal = 16.dp)