diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index a3035f0a12da..1bc74da6f9a7 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     id(Dependencies.Plugin.playPublisherId)
     id(Dependencies.Plugin.kotlinAndroidId)
     id(Dependencies.Plugin.kotlinParcelizeId)
+    id(Dependencies.Plugin.ksp) version Versions.Plugin.ksp
 }
 
 val repoRootPath = rootProject.projectDir.absoluteFile.parentFile.absolutePath
@@ -181,8 +182,7 @@ android {
 
         val enableInAppVersionNotifications =
             gradleLocalProperties(rootProject.projectDir)
-                .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS")
-                ?: "true"
+                .getProperty("ENABLE_IN_APP_VERSION_NOTIFICATIONS") ?: "true"
 
         buildConfigField(
             "boolean",
@@ -337,6 +337,9 @@ dependencies {
     implementation(Dependencies.Compose.uiController)
     implementation(Dependencies.Compose.ui)
     implementation(Dependencies.Compose.uiUtil)
+    implementation(Dependencies.Compose.destinations)
+    ksp(Dependencies.Compose.destinationsKsp)
+
     implementation(Dependencies.jodaTime)
     implementation(Dependencies.Koin.core)
     implementation(Dependencies.Koin.android)
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
index e997ae29e4e3..a8a6b93f6b9d 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreenTest.kt
@@ -41,7 +41,6 @@ class AccountScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState(
                         deviceName = DUMMY_DEVICE_NAME,
@@ -49,7 +48,6 @@ class AccountScreenTest {
                         accountExpiry = null
                     ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -66,7 +64,6 @@ class AccountScreenTest {
         val mockedClickHandler: () -> Unit = mockk(relaxed = true)
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState(
                         deviceName = DUMMY_DEVICE_NAME,
@@ -74,7 +71,6 @@ class AccountScreenTest {
                         accountExpiry = null
                     ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onManageAccountClick = mockedClickHandler
             )
         }
@@ -92,7 +88,6 @@ class AccountScreenTest {
         val mockedClickHandler: () -> Unit = mockk(relaxed = true)
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState(
                         deviceName = DUMMY_DEVICE_NAME,
@@ -100,7 +95,6 @@ class AccountScreenTest {
                         accountExpiry = null
                     ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onRedeemVoucherClick = mockedClickHandler
             )
         }
@@ -118,7 +112,6 @@ class AccountScreenTest {
         val mockedClickHandler: () -> Unit = mockk(relaxed = true)
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState(
                         deviceName = DUMMY_DEVICE_NAME,
@@ -126,7 +119,6 @@ class AccountScreenTest {
                         accountExpiry = null
                     ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onLogoutClick = mockedClickHandler
             )
         }
@@ -143,7 +135,6 @@ class AccountScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState.default()
                         .copy(
@@ -151,7 +142,6 @@ class AccountScreenTest {
                                 PurchaseResult.Completed.Success.toPaymentDialogData()
                         ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -164,7 +154,6 @@ class AccountScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState.default()
                         .copy(
@@ -172,7 +161,6 @@ class AccountScreenTest {
                                 PurchaseResult.Error.VerificationError(null).toPaymentDialogData()
                         ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -185,7 +173,6 @@ class AccountScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState.default()
                         .copy(
@@ -194,7 +181,6 @@ class AccountScreenTest {
                                     .toPaymentDialogData()
                         ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -207,11 +193,9 @@ class AccountScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState.default().copy(billingPaymentState = PaymentState.Error.Billing),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -227,7 +211,6 @@ class AccountScreenTest {
         every { mockPaymentProduct.status } returns null
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState.default()
                         .copy(
@@ -235,7 +218,6 @@ class AccountScreenTest {
                                 PaymentState.PaymentAvailable(listOf(mockPaymentProduct))
                         ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -251,7 +233,6 @@ class AccountScreenTest {
         every { mockPaymentProduct.status } returns PaymentStatus.PENDING
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState.default()
                         .copy(
@@ -259,7 +240,6 @@ class AccountScreenTest {
                                 PaymentState.PaymentAvailable(listOf(mockPaymentProduct))
                         ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -275,7 +255,6 @@ class AccountScreenTest {
         every { mockPaymentProduct.status } returns PaymentStatus.PENDING
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState.default()
                         .copy(
@@ -283,7 +262,6 @@ class AccountScreenTest {
                                 PaymentState.PaymentAvailable(listOf(mockPaymentProduct))
                         ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -306,7 +284,6 @@ class AccountScreenTest {
         every { mockPaymentProduct.status } returns PaymentStatus.VERIFICATION_IN_PROGRESS
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState.default()
                         .copy(
@@ -314,7 +291,6 @@ class AccountScreenTest {
                                 PaymentState.PaymentAvailable(listOf(mockPaymentProduct))
                         ),
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -332,7 +308,6 @@ class AccountScreenTest {
         every { mockPaymentProduct.status } returns null
         composeTestRule.setContentWithTheme {
             AccountScreen(
-                showSitePayment = true,
                 uiState =
                     AccountUiState.default()
                         .copy(
@@ -341,7 +316,6 @@ class AccountScreenTest {
                         ),
                 onPurchaseBillingProductClick = clickHandler,
                 uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt
index ab8f2b15123e..5410c627a988 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt
@@ -9,10 +9,9 @@ import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.just
 import io.mockk.verify
-import kotlinx.coroutines.flow.MutableStateFlow
 import net.mullvad.mullvadvpn.compose.dialog.ChangelogDialog
 import net.mullvad.mullvadvpn.compose.setContentWithTheme
-import net.mullvad.mullvadvpn.viewmodel.ChangelogDialogUiState
+import net.mullvad.mullvadvpn.viewmodel.ChangeLog
 import net.mullvad.mullvadvpn.viewmodel.ChangelogViewModel
 import org.junit.Before
 import org.junit.Rule
@@ -31,15 +30,15 @@ class ChangelogDialogTest {
     @Test
     fun testShowChangeLogWhenNeeded() {
         // Arrange
-        every { mockedViewModel.uiState } returns
-            MutableStateFlow(ChangelogDialogUiState.Show(listOf(CHANGELOG_ITEM)))
-        every { mockedViewModel.dismissChangelogDialog() } just Runs
+        every { mockedViewModel.markChangeLogAsRead() } just Runs
 
         composeTestRule.setContentWithTheme {
             ChangelogDialog(
-                changesList = listOf(CHANGELOG_ITEM),
-                version = CHANGELOG_VERSION,
-                onDismiss = { mockedViewModel.dismissChangelogDialog() }
+                ChangeLog(
+                    changes = listOf(CHANGELOG_ITEM),
+                    version = CHANGELOG_VERSION,
+                ),
+                onDismiss = { mockedViewModel.markChangeLogAsRead() }
             )
         }
 
@@ -50,7 +49,7 @@ class ChangelogDialogTest {
         composeTestRule.onNodeWithText(CHANGELOG_BUTTON_TEXT).performClick()
 
         // Assert
-        verify { mockedViewModel.dismissChangelogDialog() }
+        verify { mockedViewModel.markChangeLogAsRead() }
     }
 
     companion object {
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
index 56894addeaa3..55a7f491f807 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
@@ -9,9 +9,6 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.unmockkAll
 import io.mockk.verify
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import net.mullvad.mullvadvpn.compose.setContentWithTheme
 import net.mullvad.mullvadvpn.compose.state.ConnectUiState
 import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR
@@ -26,7 +23,6 @@ import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.mullvadvpn.relaylist.RelayItem
 import net.mullvad.mullvadvpn.repository.InAppNotification
 import net.mullvad.mullvadvpn.ui.VersionInfo
-import net.mullvad.mullvadvpn.viewmodel.ConnectViewModel
 import net.mullvad.talpid.net.TransportProtocol
 import net.mullvad.talpid.net.TunnelEndpoint
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
@@ -57,7 +53,6 @@ class ConnectScreenTest {
         composeTestRule.setContentWithTheme {
             ConnectScreen(
                 uiState = ConnectUiState.INITIAL,
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -88,7 +83,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.TunnelStateBlocked
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -124,7 +118,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.TunnelStateBlocked
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -158,7 +151,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -191,7 +183,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -225,7 +216,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -259,7 +249,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -298,7 +287,6 @@ class ConnectScreenTest {
                                 ErrorState(ErrorStateCause.StartTunnelError, true)
                             )
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -338,7 +326,6 @@ class ConnectScreenTest {
                                 ErrorState(ErrorStateCause.StartTunnelError, false)
                             )
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -372,7 +359,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.TunnelStateBlocked
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -408,7 +394,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.TunnelStateBlocked
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -444,7 +429,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onSwitchLocationClick = mockedClickHandler
             )
         }
@@ -477,7 +461,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onDisconnectClick = mockedClickHandler
             )
         }
@@ -510,7 +493,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onReconnectClick = mockedClickHandler
             )
         }
@@ -542,7 +524,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onConnectClick = mockedClickHandler
             )
         }
@@ -574,7 +555,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onCancelClick = mockedClickHandler
             )
         }
@@ -607,7 +587,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow(),
                 onToggleTunnelInfo = mockedClickHandler
             )
         }
@@ -647,7 +626,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = null
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -686,7 +664,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.UpdateAvailable(versionInfo)
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -723,7 +700,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.UnsupportedVersion(versionInfo)
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -757,7 +733,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.AccountExpiry(expiryDate)
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -796,7 +771,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.UnsupportedVersion(versionInfo)
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -829,7 +803,6 @@ class ConnectScreenTest {
                         daysLeftUntilExpiry = null,
                         inAppNotification = InAppNotification.AccountExpiry(expiryDate)
                     ),
-                uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
             )
         }
 
@@ -846,10 +819,6 @@ class ConnectScreenTest {
         composeTestRule.setContentWithTheme {
             ConnectScreen(
                 uiState = ConnectUiState.INITIAL,
-                uiSideEffect =
-                    MutableStateFlow(
-                        ConnectViewModel.UiSideEffect.OpenAccountManagementPageInBrowser("222")
-                    )
             )
         }
 
@@ -864,8 +833,6 @@ class ConnectScreenTest {
         composeTestRule.setContentWithTheme {
             ConnectScreen(
                 uiState = ConnectUiState.INITIAL,
-                uiSideEffect = MutableStateFlow(ConnectViewModel.UiSideEffect.OpenOutOfTimeView),
-                onOpenOutOfTimeScreen = mockedOpenScreenHandler
             )
         }
 
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt
index 3b5da50d3374..0b5df29662ec 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreenTest.kt
@@ -8,7 +8,6 @@ import io.mockk.MockKAnnotations
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import net.mullvad.mullvadvpn.compose.setContentWithTheme
 import net.mullvad.mullvadvpn.compose.state.SelectLocationUiState
 import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR
@@ -40,7 +39,6 @@ class SelectLocationScreenTest {
             SelectLocationScreen(
                 uiState = SelectLocationUiState.Loading,
                 uiCloseAction = MutableSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -59,7 +57,6 @@ class SelectLocationScreenTest {
                         selectedRelay = null
                     ),
                 uiCloseAction = MutableSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -96,7 +93,6 @@ class SelectLocationScreenTest {
                         selectedRelay = updatedDummyList[0].cities[0].relays[0]
                     ),
                 uiCloseAction = MutableSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
 
@@ -120,7 +116,6 @@ class SelectLocationScreenTest {
                 uiState =
                     SelectLocationUiState.ShowData(countries = emptyList(), selectedRelay = null),
                 uiCloseAction = MutableSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onSearchTermInput = mockedSearchTermInput
             )
         }
@@ -142,7 +137,6 @@ class SelectLocationScreenTest {
             SelectLocationScreen(
                 uiState = SelectLocationUiState.NoSearchResultFound(searchTerm = mockSearchString),
                 uiCloseAction = MutableSharedFlow(),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow(),
                 onSearchTermInput = mockedSearchTermInput
             )
         }
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt
index 576660551e6a..e15ed012d6a3 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt
@@ -4,8 +4,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithText
 import io.mockk.MockKAnnotations
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import net.mullvad.mullvadvpn.compose.setContentWithTheme
 import net.mullvad.mullvadvpn.compose.state.SettingsUiState
 import org.junit.Before
@@ -28,7 +26,6 @@ class SettingsScreenTest {
             SettingsScreen(
                 uiState =
                     SettingsUiState(appVersion = "", isLoggedIn = true, isUpdateAvailable = true),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
         // Assert
@@ -47,7 +44,6 @@ class SettingsScreenTest {
             SettingsScreen(
                 uiState =
                     SettingsUiState(appVersion = "", isLoggedIn = false, isUpdateAvailable = true),
-                enterTransitionEndAction = MutableSharedFlow<Unit>().asSharedFlow()
             )
         }
         // Assert
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
index 9b6dd9e492ba..fa92507a3c45 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
@@ -16,7 +16,6 @@ import io.mockk.verify
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import net.mullvad.mullvadvpn.compose.setContentWithTheme
-import net.mullvad.mullvadvpn.compose.state.VpnSettingsDialog
 import net.mullvad.mullvadvpn.compose.state.VpnSettingsUiState
 import net.mullvad.mullvadvpn.compose.test.CUSTOM_PORT_DIALOG_INPUT_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_LAST_ITEM_TEST_TAG
@@ -28,11 +27,10 @@ import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_WIREGUARD_CUSTOM_PORT_TEXT_
 import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_WIREGUARD_PORT_ITEM_X_TEST_TAG
 import net.mullvad.mullvadvpn.model.Constraint
 import net.mullvad.mullvadvpn.model.Port
-import net.mullvad.mullvadvpn.model.PortRange
 import net.mullvad.mullvadvpn.model.QuantumResistantState
 import net.mullvad.mullvadvpn.onNodeWithTagAndText
 import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
-import net.mullvad.mullvadvpn.viewmodel.StagedDns
+import net.mullvad.mullvadvpn.viewmodel.VpnSettingsSideEffect
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -51,7 +49,7 @@ class VpnSettingsScreenTest {
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
                 uiState = VpnSettingsUiState.createDefault(),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -74,7 +72,7 @@ class VpnSettingsScreenTest {
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
                 uiState = VpnSettingsUiState.createDefault(mtu = VALID_DUMMY_MTU_VALUE),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -93,8 +91,7 @@ class VpnSettingsScreenTest {
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
                 uiState = VpnSettingsUiState.createDefault(),
-                onMtuCellClick = mockedClickHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
             )
         }
 
@@ -114,11 +111,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog = VpnSettingsDialog.Mtu(mtuEditValue = EMPTY_STRING),
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -131,11 +125,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog = VpnSettingsDialog.Mtu(mtuEditValue = VALID_DUMMY_MTU_VALUE)
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -148,11 +139,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog = VpnSettingsDialog.Mtu(mtuEditValue = EMPTY_STRING)
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -169,12 +157,8 @@ class VpnSettingsScreenTest {
         val mockedSubmitHandler: (Int) -> Unit = mockk(relaxed = true)
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog = VpnSettingsDialog.Mtu(mtuEditValue = VALID_DUMMY_MTU_VALUE)
-                    ),
-                onSaveMtuClick = mockedSubmitHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
             )
         }
 
@@ -190,11 +174,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog = VpnSettingsDialog.Mtu(mtuEditValue = INVALID_DUMMY_MTU_VALUE)
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -208,12 +189,8 @@ class VpnSettingsScreenTest {
         val mockedClickHandler: () -> Unit = mockk(relaxed = true)
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog = VpnSettingsDialog.Mtu(mtuEditValue = EMPTY_STRING)
-                    ),
-                onRestoreMtuClick = mockedClickHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
             )
         }
 
@@ -230,12 +207,8 @@ class VpnSettingsScreenTest {
         val mockedClickHandler: () -> Unit = mockk(relaxed = true)
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog = VpnSettingsDialog.Mtu(mtuEditValue = EMPTY_STRING)
-                    ),
-                onCancelMtuDialogClick = mockedClickHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
             )
         }
 
@@ -254,7 +227,6 @@ class VpnSettingsScreenTest {
                 uiState =
                     VpnSettingsUiState.createDefault(
                         isCustomDnsEnabled = true,
-                        isAllowLanEnabled = false,
                         customDnsItems =
                             listOf(
                                 CustomDnsItem(address = DUMMY_DNS_ADDRESS, false),
@@ -262,7 +234,7 @@ class VpnSettingsScreenTest {
                                 CustomDnsItem(address = DUMMY_DNS_ADDRESS_3, false)
                             )
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -285,7 +257,7 @@ class VpnSettingsScreenTest {
                         isCustomDnsEnabled = false,
                         customDnsItems = listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, false))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
         composeTestRule
@@ -304,11 +276,10 @@ class VpnSettingsScreenTest {
                 uiState =
                     VpnSettingsUiState.createDefault(
                         isCustomDnsEnabled = true,
-                        isAllowLanEnabled = true,
                         customDnsItems =
                             listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -324,11 +295,10 @@ class VpnSettingsScreenTest {
                 uiState =
                     VpnSettingsUiState.createDefault(
                         isCustomDnsEnabled = true,
-                        isAllowLanEnabled = false,
                         customDnsItems =
                             listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -344,11 +314,10 @@ class VpnSettingsScreenTest {
                 uiState =
                     VpnSettingsUiState.createDefault(
                         isCustomDnsEnabled = true,
-                        isAllowLanEnabled = true,
                         customDnsItems =
                             listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -364,11 +333,10 @@ class VpnSettingsScreenTest {
                 uiState =
                     VpnSettingsUiState.createDefault(
                         isCustomDnsEnabled = true,
-                        isAllowLanEnabled = false,
                         customDnsItems =
                             listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -385,8 +353,7 @@ class VpnSettingsScreenTest {
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
                 uiState = VpnSettingsUiState.createDefault(isCustomDnsEnabled = true),
-                onDnsClick = mockedClickHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
             )
         }
 
@@ -402,17 +369,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.Dns(
-                                stagedDns =
-                                    StagedDns.NewDns(
-                                        item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false)
-                                    ),
-                            )
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -425,18 +383,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.Dns(
-                                stagedDns =
-                                    StagedDns.EditDns(
-                                        item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
-                                        index = 0
-                                    )
-                            )
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -449,19 +397,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.Dns(
-                                stagedDns =
-                                    StagedDns.NewDns(
-                                        item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = true),
-                                        validationResult = StagedDns.ValidationResult.Success
-                                    ),
-                            ),
-                        isAllowLanEnabled = false
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -474,19 +411,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.Dns(
-                                stagedDns =
-                                    StagedDns.NewDns(
-                                        item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = true),
-                                        validationResult = StagedDns.ValidationResult.Success
-                                    ),
-                            ),
-                        isAllowLanEnabled = true
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -499,19 +425,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.Dns(
-                                stagedDns =
-                                    StagedDns.NewDns(
-                                        item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
-                                        validationResult = StagedDns.ValidationResult.Success
-                                    ),
-                            ),
-                        isAllowLanEnabled = true
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -524,19 +439,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.Dns(
-                                stagedDns =
-                                    StagedDns.NewDns(
-                                        item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
-                                        validationResult = StagedDns.ValidationResult.Success
-                                    ),
-                            ),
-                        isAllowLanEnabled = false
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -549,18 +453,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.Dns(
-                                stagedDns =
-                                    StagedDns.NewDns(
-                                        item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
-                                        validationResult = StagedDns.ValidationResult.InvalidAddress
-                                    )
-                            )
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -573,19 +467,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.Dns(
-                                stagedDns =
-                                    StagedDns.NewDns(
-                                        item = CustomDnsItem(DUMMY_DNS_ADDRESS, isLocal = false),
-                                        validationResult =
-                                            StagedDns.ValidationResult.DuplicateAddress
-                                    )
-                            ),
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -600,7 +483,7 @@ class VpnSettingsScreenTest {
             VpnSettingsScreen(
                 uiState =
                     VpnSettingsUiState.createDefault(quantumResistant = QuantumResistantState.On),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
         composeTestRule
@@ -624,8 +507,8 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         quantumResistant = QuantumResistantState.Auto,
                     ),
-                onSelectQuantumResistanceSetting = mockSelectQuantumResistantSettingListener,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
+                onSelectQuantumResistanceSetting = mockSelectQuantumResistantSettingListener
             )
         }
         composeTestRule
@@ -646,11 +529,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog = VpnSettingsDialog.QuantumResistanceInfo
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -667,7 +547,7 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         selectedWireguardPort = Constraint.Only(Port(53))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -698,8 +578,8 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         selectedWireguardPort = Constraint.Only(Port(53))
                     ),
-                onWireguardPortSelected = mockSelectWireguardPortSelectionListener,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
+                onWireguardPortSelected = mockSelectWireguardPortSelectionListener
             )
         }
 
@@ -727,14 +607,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.WireguardPortInfo(
-                                availablePortRanges = listOf(PortRange(53, 53), PortRange(120, 121))
-                            )
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -751,14 +625,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.CustomPort(
-                                availablePortRanges = listOf(PortRange(53, 53), PortRange(120, 121))
-                            )
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -775,7 +643,7 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         selectedWireguardPort = Constraint.Only(Port(4000))
                     ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
@@ -795,8 +663,7 @@ class VpnSettingsScreenTest {
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
                 uiState = VpnSettingsUiState.createDefault(),
-                onShowCustomPortDialog = mockOnShowCustomPortDialog,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
             )
         }
 
@@ -820,8 +687,7 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         selectedWireguardPort = Constraint.Only(Port(4000))
                     ),
-                onShowCustomPortDialog = mockOnShowCustomPortDialog,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
             )
         }
 
@@ -847,8 +713,8 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         selectedWireguardPort = Constraint.Only(Port(4000))
                     ),
-                onWireguardPortSelected = onWireguardPortSelected,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
+                onWireguardPortSelected = onWireguardPortSelected
             )
         }
 
@@ -872,14 +738,8 @@ class VpnSettingsScreenTest {
         // Arrange
         composeTestRule.setContentWithTheme {
             VpnSettingsScreen(
-                uiState =
-                    VpnSettingsUiState.createDefault(
-                        dialog =
-                            VpnSettingsDialog.CustomPort(
-                                availablePortRanges = listOf(PortRange(53, 53), PortRange(120, 121))
-                            )
-                    ),
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
+                uiState = VpnSettingsUiState.createDefault(),
+                sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow()
             )
         }
 
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt
index a54c41c20d71..baa69ed678c1 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreenTest.kt
@@ -48,6 +48,7 @@ class WelcomeScreenTest {
                 onSettingsClick = {},
                 onAccountClick = {},
                 openConnectScreen = {},
+                navigateToDeviceInfoDialog = {},
                 onPurchaseBillingProductClick = { _, _ -> },
                 onClosePurchaseResultDialog = {}
             )
@@ -73,6 +74,7 @@ class WelcomeScreenTest {
                 onSettingsClick = {},
                 onAccountClick = {},
                 openConnectScreen = {},
+                navigateToDeviceInfoDialog = {},
                 onPurchaseBillingProductClick = { _, _ -> },
                 onClosePurchaseResultDialog = {}
             )
@@ -105,7 +107,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -128,7 +131,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -151,7 +155,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = mockClickListener,
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -174,7 +179,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -200,7 +206,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -228,7 +235,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -254,7 +262,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -282,7 +291,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -304,7 +314,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onClosePurchaseResultDialog = {},
-                onPurchaseBillingProductClick = { _, _ -> }
+                onPurchaseBillingProductClick = { _, _ -> },
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -333,7 +344,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -363,7 +375,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -393,7 +406,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -430,7 +444,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = { _, _ -> },
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
@@ -461,7 +476,8 @@ class WelcomeScreenTest {
                 onAccountClick = {},
                 openConnectScreen = {},
                 onPurchaseBillingProductClick = clickHandler,
-                onClosePurchaseResultDialog = {}
+                onClosePurchaseResultDialog = {},
+                navigateToDeviceInfoDialog = {}
             )
         }
 
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 432244d16f2c..1985e27e2262 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
     <uses-feature android:name="android.hardware.touchscreen"
                   android:required="false" />
     <uses-feature android:name="android.hardware.faketouch"
@@ -32,8 +33,8 @@
                   android:exported="true"
                   android:launchMode="singleTask"
                   android:configChanges="orientation|screenSize|screenLayout"
-                  android:screenOrientation="locked"
-                  android:windowSoftInputMode="adjustPan">
+                  android:screenOrientation="fullUser"
+                  android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -52,6 +53,7 @@
         <service android:name="net.mullvad.mullvadvpn.service.MullvadVpnService"
                  android:exported="true"
                  android:permission="android.permission.BIND_VPN_SERVICE"
+                 android:foregroundServiceType="systemExempted"
                  android:process=":mullvadvpn_daemon"
                  android:stopWithTask="false">
             <intent-filter>
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt
index 8219aa998431..cd5a08edbfb4 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt
@@ -37,8 +37,8 @@ import net.mullvad.mullvadvpn.lib.theme.color.selected
 private fun PreviewCustomPortCell() {
     AppTheme {
         SpacedColumn(Modifier.background(MaterialTheme.colorScheme.background)) {
-            CustomPortCell(title = "Title", isSelected = true, port = "444")
-            CustomPortCell(title = "Title", isSelected = false, port = "")
+            CustomPortCell(title = "Title", isSelected = true, port = 444)
+            CustomPortCell(title = "Title", isSelected = false, port = null)
         }
     }
 }
@@ -47,7 +47,7 @@ private fun PreviewCustomPortCell() {
 fun CustomPortCell(
     title: String,
     isSelected: Boolean,
-    port: String,
+    port: Int?,
     mainTestTag: String = "",
     numberTestTag: String = "",
     onMainCellClicked: () -> Unit = {},
@@ -100,7 +100,7 @@ fun CustomPortCell(
                     .testTag(numberTestTag)
         ) {
             Text(
-                text = port.ifEmpty { stringResource(id = R.string.port) },
+                text = port?.toString() ?: stringResource(id = R.string.port),
                 color = MaterialTheme.colorScheme.onPrimary,
                 modifier = Modifier.align(Alignment.Center)
             )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt
index 4d6fb89834bb..2a0043842a64 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt
@@ -1,12 +1,10 @@
 package net.mullvad.mullvadvpn.compose.cell
 
-import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
@@ -54,12 +52,12 @@ fun DnsCell(
 }
 
 @Composable
-private fun DnsTitle(address: String, modifier: Modifier = Modifier) {
+private fun RowScope.DnsTitle(address: String, modifier: Modifier = Modifier) {
     Text(
         text = address,
         color = Color.White,
         style = MaterialTheme.typography.labelLarge,
         textAlign = TextAlign.Start,
-        modifier = modifier.wrapContentWidth(align = Alignment.End).wrapContentHeight()
+        modifier = modifier.weight(1f)
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CopyableObfuscationView.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CopyableObfuscationView.kt
index a4352147329a..12e657d3ed38 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CopyableObfuscationView.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/CopyableObfuscationView.kt
@@ -11,24 +11,25 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.AnimatedIconButton
-import net.mullvad.mullvadvpn.lib.common.util.SdkUtils
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.ui.extension.copyToClipboard
 
 @Preview
 @Composable
 private fun PreviewCopyableObfuscationView() {
-    AppTheme { CopyableObfuscationView("1111222233334444", modifier = Modifier.fillMaxWidth()) }
+    AppTheme { CopyableObfuscationView("1111222233334444", {}, modifier = Modifier.fillMaxWidth()) }
 }
 
 @Composable
-fun CopyableObfuscationView(content: String, modifier: Modifier = Modifier) {
+fun CopyableObfuscationView(
+    content: String,
+    onCopyClicked: (String) -> Unit,
+    modifier: Modifier = Modifier
+) {
     var obfuscationEnabled by remember { mutableStateOf(true) }
 
     Row(verticalAlignment = CenterVertically, modifier = modifier) {
@@ -45,19 +46,7 @@ fun CopyableObfuscationView(content: String, modifier: Modifier = Modifier) {
             onClick = { obfuscationEnabled = !obfuscationEnabled }
         )
 
-        val context = LocalContext.current
-        val copy = {
-            context.copyToClipboard(
-                content = content,
-                clipboardLabel = context.getString(R.string.mullvad_account_number)
-            )
-            SdkUtils.showCopyToastIfNeeded(
-                context,
-                context.getString(R.string.copied_mullvad_account_number)
-            )
-        }
-
-        CopyAnimatedIconButton(onClick = copy)
+        CopyAnimatedIconButton(onClick = { onCopyClicked(content) })
     }
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
index 11abdad19103..197ce53221af 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
@@ -19,33 +19,25 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaTopBar
 
 @Composable
 fun ScaffoldWithTopBar(
     topBarColor: Color,
-    statusBarColor: Color,
-    navigationBarColor: Color,
     modifier: Modifier = Modifier,
     iconTintColor: Color = MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaTopBar),
     onSettingsClicked: (() -> Unit)?,
     onAccountClicked: (() -> Unit)?,
     isIconAndLogoVisible: Boolean = true,
     snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
+    enabled: Boolean = true,
     content: @Composable (PaddingValues) -> Unit,
 ) {
-    val systemUiController = rememberSystemUiController()
-    LaunchedEffect(key1 = statusBarColor, key2 = navigationBarColor) {
-        systemUiController.setStatusBarColor(statusBarColor)
-        systemUiController.setNavigationBarColor(navigationBarColor)
-    }
 
     Scaffold(
         modifier = modifier,
@@ -55,7 +47,8 @@ fun ScaffoldWithTopBar(
                 iconTintColor = iconTintColor,
                 onSettingsClicked = onSettingsClicked,
                 onAccountClicked = onAccountClicked,
-                isIconAndLogoVisible = isIconAndLogoVisible
+                isIconAndLogoVisible = isIconAndLogoVisible,
+                enabled = enabled,
             )
         },
         snackbarHost = {
@@ -71,8 +64,6 @@ fun ScaffoldWithTopBar(
 @Composable
 fun ScaffoldWithTopBarAndDeviceName(
     topBarColor: Color,
-    statusBarColor: Color,
-    navigationBarColor: Color?,
     modifier: Modifier = Modifier,
     iconTintColor: Color = MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaTopBar),
     onSettingsClicked: (() -> Unit)?,
@@ -83,14 +74,6 @@ fun ScaffoldWithTopBarAndDeviceName(
     timeLeft: Int?,
     content: @Composable (PaddingValues) -> Unit,
 ) {
-    val systemUiController = rememberSystemUiController()
-    LaunchedEffect(key1 = statusBarColor, key2 = navigationBarColor) {
-        systemUiController.setStatusBarColor(statusBarColor)
-        if (navigationBarColor != null) {
-            systemUiController.setNavigationBarColor(navigationBarColor)
-        }
-    }
-
     Scaffold(
         modifier = modifier,
         topBar = {
@@ -130,6 +113,7 @@ fun ScaffoldWithMediumTopBar(
     actions: @Composable RowScope.() -> Unit = {},
     lazyListState: LazyListState = rememberLazyListState(),
     scrollbarColor: Color = MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaScrollbar),
+    snackbarHostState: SnackbarHostState = remember { SnackbarHostState() },
     content: @Composable (modifier: Modifier, lazyListState: LazyListState) -> Unit
 ) {
 
@@ -147,6 +131,12 @@ fun ScaffoldWithMediumTopBar(
                 scrollBehavior = if (canScroll) scrollBehavior else null
             )
         },
+        snackbarHost = {
+            SnackbarHost(
+                snackbarHostState,
+                snackbar = { snackbarData -> MullvadSnackbar(snackbarData = snackbarData) }
+            )
+        },
         content = {
             content(
                 Modifier.fillMaxSize()
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
index 6db5d6473599..064308bee387 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
@@ -104,6 +104,7 @@ fun MullvadTopBar(
     onSettingsClicked: (() -> Unit)?,
     onAccountClicked: (() -> Unit)?,
     modifier: Modifier = Modifier,
+    enabled: Boolean = true,
     iconTintColor: Color,
     isIconAndLogoVisible: Boolean = true
 ) {
@@ -149,7 +150,7 @@ fun MullvadTopBar(
         },
         actions = {
             if (onAccountClicked != null) {
-                IconButton(onClick = onAccountClicked) {
+                IconButton(enabled = enabled, onClick = onAccountClicked) {
                     Icon(
                         painter = painterResource(R.drawable.icon_account),
                         tint = iconTintColor,
@@ -159,7 +160,7 @@ fun MullvadTopBar(
             }
 
             if (onSettingsClicked != null) {
-                IconButton(onClick = onSettingsClicked) {
+                IconButton(enabled = enabled, onClick = onSettingsClicked) {
                     Icon(
                         painter = painterResource(R.drawable.icon_settings),
                         tint = iconTintColor,
@@ -274,6 +275,7 @@ fun MullvadTopBarWithDeviceName(
             onSettingsClicked,
             onAccountClicked,
             Modifier,
+            enabled = true,
             iconTintColor,
             isIconAndLogoVisible,
         )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt
index 9ce21c6bac1c..755c13056830 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ChangelogDialog.kt
@@ -16,18 +16,38 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.navigation.NavController
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
+import net.mullvad.mullvadvpn.viewmodel.ChangeLog
+import net.mullvad.mullvadvpn.viewmodel.ChangelogViewModel
+import org.koin.androidx.compose.koinViewModel
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun ChangelogDialog(changesList: List<String>, version: String, onDismiss: () -> Unit) {
+fun Changelog(navController: NavController, changeLog: ChangeLog) {
+    val viewModel = koinViewModel<ChangelogViewModel>()
+
+    ChangelogDialog(
+        changeLog,
+        onDismiss = {
+            viewModel.markChangeLogAsRead()
+            navController.navigateUp()
+        }
+    )
+}
+
+@Composable
+fun ChangelogDialog(changeLog: ChangeLog, onDismiss: () -> Unit) {
     AlertDialog(
         onDismissRequest = onDismiss,
         title = {
             Text(
-                text = version,
+                text = changeLog.version,
                 style = MaterialTheme.typography.headlineLarge,
                 textAlign = TextAlign.Center,
                 modifier = Modifier.fillMaxWidth()
@@ -46,7 +66,7 @@ fun ChangelogDialog(changesList: List<String>, version: String, onDismiss: () ->
                     modifier = Modifier.fillMaxWidth()
                 )
 
-                changesList.forEach { changeItem -> ChangeListItem(text = changeItem) }
+                changeLog.changes.forEach { changeItem -> ChangeListItem(text = changeItem) }
             }
         },
         confirmButton = {
@@ -80,7 +100,9 @@ private fun ChangeListItem(text: String) {
 @Preview
 @Composable
 private fun PreviewChangelogDialogWithSingleShortItem() {
-    AppTheme { ChangelogDialog(changesList = listOf("Item 1"), version = "1111.1", onDismiss = {}) }
+    AppTheme {
+        ChangelogDialog(ChangeLog(changes = listOf("Item 1"), version = "1111.1"), onDismiss = {})
+    }
 }
 
 @Preview
@@ -93,8 +115,7 @@ private fun PreviewChangelogDialogWithTwoLongItems() {
 
     AppTheme {
         ChangelogDialog(
-            changesList = listOf(longPreviewText, longPreviewText),
-            version = "1111.1",
+            ChangeLog(changes = listOf(longPreviewText, longPreviewText), version = "1111.1"),
             onDismiss = {}
         )
     }
@@ -105,20 +126,22 @@ private fun PreviewChangelogDialogWithTwoLongItems() {
 private fun PreviewChangelogDialogWithTenShortItems() {
     AppTheme {
         ChangelogDialog(
-            changesList =
-                listOf(
-                    "Item 1",
-                    "Item 2",
-                    "Item 3",
-                    "Item 4",
-                    "Item 5",
-                    "Item 6",
-                    "Item 7",
-                    "Item 8",
-                    "Item 9",
-                    "Item 10"
-                ),
-            version = "1111.1",
+            ChangeLog(
+                changes =
+                    listOf(
+                        "Item 1",
+                        "Item 2",
+                        "Item 3",
+                        "Item 4",
+                        "Item 5",
+                        "Item 6",
+                        "Item 7",
+                        "Item 8",
+                        "Item 9",
+                        "Item 10"
+                    ),
+                version = "1111.1"
+            ),
             onDismiss = {}
         )
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt
index 29a57ed33175..145208ce165e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt
@@ -2,11 +2,15 @@ package net.mullvad.mullvadvpn.compose.dialog
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.component.textResource
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun ContentBlockersInfoDialog(onDismiss: () -> Unit) {
+fun ContentBlockersInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message =
             buildString {
@@ -20,6 +24,6 @@ fun ContentBlockersInfoDialog(onDismiss: () -> Unit) {
                     stringResource(id = R.string.settings_changes_effect_warning_content_blocker)
                 )
             },
-        onDismiss = onDismiss
+        onDismiss = navigator::navigateUp
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomDnsInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomDnsInfoDialog.kt
index cf9233ec94ce..f58768d0c6ab 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomDnsInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomDnsInfoDialog.kt
@@ -3,18 +3,23 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 
 @Preview
 @Composable
 private fun PreviewCustomDnsInfoDialog() {
-    CustomDnsInfoDialog(onDismiss = {})
+    CustomDnsInfoDialog(EmptyDestinationsNavigator)
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun CustomDnsInfoDialog(onDismiss: () -> Unit) {
+fun CustomDnsInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message = stringResource(id = R.string.settings_changes_effect_warning_content_blocker),
-        onDismiss = onDismiss
+        onDismiss = navigator::navigateUp
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceNameInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceNameInfoDialog.kt
index 39e82bc57dd7..0e1c315959a4 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceNameInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceNameInfoDialog.kt
@@ -2,10 +2,14 @@ package net.mullvad.mullvadvpn.compose.dialog
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun DeviceNameInfoDialog(onDismiss: () -> Unit) {
+fun DeviceNameInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message =
             buildString {
@@ -15,6 +19,6 @@ fun DeviceNameInfoDialog(onDismiss: () -> Unit) {
                 appendLine()
                 append(stringResource(id = R.string.device_name_info_third_paragraph))
             },
-        onDismiss = onDismiss
+        onDismiss = navigator::navigateUp
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
index 527fcf8738f9..a950d86218c9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
@@ -8,32 +8,45 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
 import net.mullvad.mullvadvpn.compose.textfield.DnsTextField
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.MullvadRed
-import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
-import net.mullvad.mullvadvpn.viewmodel.StagedDns
+import net.mullvad.mullvadvpn.viewmodel.DnsDialogSideEffect
+import net.mullvad.mullvadvpn.viewmodel.DnsDialogViewModel
+import net.mullvad.mullvadvpn.viewmodel.DnsDialogViewState
+import org.koin.androidx.compose.koinViewModel
+import org.koin.core.parameter.parametersOf
 
 @Preview
 @Composable
 private fun PreviewDnsDialogNew() {
     AppTheme {
         DnsDialog(
-            stagedDns =
-                StagedDns.NewDns(CustomDnsItem.default(), StagedDns.ValidationResult.Success),
-            isAllowLanEnabled = true,
-            onIpAddressChanged = {},
-            onAttemptToSave = {},
-            onRemove = {},
-            onDismiss = {}
+            DnsDialogViewState(
+                "1.1.1.1",
+                DnsDialogViewState.ValidationResult.Success,
+                false,
+                false,
+                true
+            ),
+            {},
+            {},
+            {},
+            {}
         )
     }
 }
@@ -43,17 +56,17 @@ private fun PreviewDnsDialogNew() {
 private fun PreviewDnsDialogEdit() {
     AppTheme {
         DnsDialog(
-            stagedDns =
-                StagedDns.EditDns(
-                    CustomDnsItem("1.1.1.1", false),
-                    StagedDns.ValidationResult.Success,
-                    0
-                ),
-            isAllowLanEnabled = true,
-            onIpAddressChanged = {},
-            onAttemptToSave = {},
-            onRemove = {},
-            onDismiss = {}
+            DnsDialogViewState(
+                "1.1.1.1",
+                DnsDialogViewState.ValidationResult.Success,
+                false,
+                false,
+                false
+            ),
+            {},
+            {},
+            {},
+            {}
         )
     }
 }
@@ -63,35 +76,62 @@ private fun PreviewDnsDialogEdit() {
 private fun PreviewDnsDialogEditAllowLanDisabled() {
     AppTheme {
         DnsDialog(
-            stagedDns =
-                StagedDns.EditDns(
-                    CustomDnsItem(address = "1.1.1.1", isLocal = true),
-                    StagedDns.ValidationResult.Success,
-                    0
-                ),
-            isAllowLanEnabled = false,
-            onIpAddressChanged = {},
-            onAttemptToSave = {},
-            onRemove = {},
-            onDismiss = {}
+            DnsDialogViewState(
+                "192.168.1.1",
+                DnsDialogViewState.ValidationResult.Success,
+                true,
+                false,
+                true
+            ),
+            {},
+            {},
+            {},
+            {}
         )
     }
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
 fun DnsDialog(
-    stagedDns: StagedDns,
-    isAllowLanEnabled: Boolean,
-    onIpAddressChanged: (String) -> Unit,
-    onAttemptToSave: () -> Unit,
-    onRemove: () -> Unit,
+    resultNavigator: ResultBackNavigator<Boolean>,
+    index: Int?,
+    initialValue: String?,
+) {
+    val viewModel =
+        koinViewModel<DnsDialogViewModel>(parameters = { parametersOf(initialValue, index) })
+
+    LaunchedEffect(Unit) {
+        viewModel.uiSideEffect.collect {
+            when (it) {
+                DnsDialogSideEffect.Complete -> resultNavigator.navigateBack(result = true)
+            }
+        }
+    }
+    val state by viewModel.uiState.collectAsState()
+
+    DnsDialog(
+        state,
+        viewModel::onDnsInputChange,
+        onSaveDnsClick = viewModel::onSaveDnsClick,
+        onRemoveDnsClick = viewModel::onRemoveDnsClick,
+        onDismiss = { resultNavigator.navigateBack(false) }
+    )
+}
+
+@Composable
+private fun DnsDialog(
+    state: DnsDialogViewState,
+    onDnsInputChange: (String) -> Unit,
+    onSaveDnsClick: () -> Unit,
+    onRemoveDnsClick: () -> Unit,
     onDismiss: () -> Unit
 ) {
     AlertDialog(
         title = {
             Text(
                 text =
-                    if (stagedDns is StagedDns.NewDns) {
+                    if (state.isNewEntry) {
                         stringResource(R.string.add_dns_server_dialog_title)
                     } else {
                         stringResource(R.string.update_dns_server_dialog_title)
@@ -103,10 +143,10 @@ fun DnsDialog(
         text = {
             Column {
                 DnsTextField(
-                    value = stagedDns.item.address,
-                    isValidValue = stagedDns.isValid(),
-                    onValueChanged = { newMtuValue -> onIpAddressChanged(newMtuValue) },
-                    onSubmit = { onAttemptToSave() },
+                    value = state.ipAddress,
+                    isValidValue = state.isValid(),
+                    onValueChanged = { newDnsValue -> onDnsInputChange(newDnsValue) },
+                    onSubmit = onSaveDnsClick,
                     isEnabled = true,
                     placeholderText = stringResource(R.string.custom_dns_hint),
                     modifier = Modifier.fillMaxWidth()
@@ -114,11 +154,11 @@ fun DnsDialog(
 
                 val errorMessage =
                     when {
-                        stagedDns.validationResult is
-                            StagedDns.ValidationResult.DuplicateAddress -> {
+                        state.validationResult is
+                            DnsDialogViewState.ValidationResult.DuplicateAddress -> {
                             stringResource(R.string.duplicate_address_warning)
                         }
-                        stagedDns.item.isLocal && isAllowLanEnabled.not() -> {
+                        state.isLocal && !state.isAllowLanEnabled -> {
                             stringResource(id = R.string.confirm_local_dns)
                         }
                         else -> {
@@ -140,15 +180,15 @@ fun DnsDialog(
             Column(verticalArrangement = Arrangement.spacedBy(Dimens.buttonSpacing)) {
                 PrimaryButton(
                     modifier = Modifier.fillMaxWidth(),
-                    onClick = onAttemptToSave,
-                    isEnabled = stagedDns.isValid(),
+                    onClick = onSaveDnsClick,
+                    isEnabled = state.isValid(),
                     text = stringResource(id = R.string.submit_button),
                 )
 
-                if (stagedDns is StagedDns.EditDns) {
+                if (!state.isNewEntry) {
                     PrimaryButton(
                         modifier = Modifier.fillMaxWidth(),
-                        onClick = onRemove,
+                        onClick = onRemoveDnsClick,
                         text = stringResource(id = R.string.remove_button)
                     )
                 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/LocalNetworkSharingInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/LocalNetworkSharingInfoDialog.kt
index 983d0c1e04be..ebe46b6050dd 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/LocalNetworkSharingInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/LocalNetworkSharingInfoDialog.kt
@@ -3,17 +3,22 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.component.textResource
 
 @Preview
 @Composable
 private fun PreviewLocalNetworkSharingInfoDialog() {
-    LocalNetworkSharingInfoDialog(onDismiss = {})
+    LocalNetworkSharingInfoDialog(EmptyDestinationsNavigator)
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun LocalNetworkSharingInfoDialog(onDismiss: () -> Unit) {
+fun LocalNetworkSharingInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message = stringResource(id = R.string.local_network_sharing_info),
         additionalInfo =
@@ -21,6 +26,6 @@ fun LocalNetworkSharingInfoDialog(onDismiss: () -> Unit) {
                 appendLine(stringResource(id = R.string.local_network_sharing_additional_info))
                 appendLine(textResource(id = R.string.local_network_sharing_ip_ranges))
             },
-        onDismiss = onDismiss
+        onDismiss = navigator::navigateUp
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MalwareInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MalwareInfoDialog.kt
index 378e95c98e61..1f627be040fa 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MalwareInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MalwareInfoDialog.kt
@@ -3,15 +3,23 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 
 @Preview
 @Composable
 private fun PreviewMalwareInfoDialog() {
-    MalwareInfoDialog(onDismiss = {})
+    MalwareInfoDialog(EmptyDestinationsNavigator)
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun MalwareInfoDialog(onDismiss: () -> Unit) {
-    InfoDialog(message = stringResource(id = R.string.malware_info), onDismiss = onDismiss)
+fun MalwareInfoDialog(navigator: DestinationsNavigator) {
+    InfoDialog(
+        message = stringResource(id = R.string.malware_info),
+        onDismiss = navigator::navigateUp
+    )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt
index bc28169bb23d..6b7693236834 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt
@@ -8,11 +8,17 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
+import kotlinx.coroutines.flow.collect
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
 import net.mullvad.mullvadvpn.compose.textfield.MtuTextField
@@ -22,28 +28,33 @@ import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaDescription
 import net.mullvad.mullvadvpn.util.isValidMtu
+import net.mullvad.mullvadvpn.viewmodel.MtuDialogSideEffect
+import net.mullvad.mullvadvpn.viewmodel.MtuDialogViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
 private fun PreviewMtuDialog() {
-    AppTheme {
-        MtuDialog(mtuInitial = 1234, onSave = {}, onRestoreDefaultValue = {}, onDismiss = {})
-    }
+    AppTheme { MtuDialog(mtuInitial = 1234, EmptyDestinationsNavigator) }
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun MtuDialog(
-    mtuInitial: Int?,
-    onSave: (Int) -> Unit,
-    onRestoreDefaultValue: () -> Unit,
-    onDismiss: () -> Unit,
-) {
+fun MtuDialog(mtuInitial: Int?, navigator: DestinationsNavigator) {
     val mtu = remember { mutableStateOf(mtuInitial?.toString() ?: "") }
+    val viewModel = koinViewModel<MtuDialogViewModel>()
 
+    LaunchedEffect(Unit) {
+        viewModel.uiSideEffect.collect {
+            when (it) {
+                MtuDialogSideEffect.Complete -> navigator.navigateUp()
+            }
+        }
+    }
     val isValidMtu = mtu.value.toIntOrNull()?.isValidMtu() == true
 
     AlertDialog(
-        onDismissRequest = onDismiss,
+        onDismissRequest = navigator::navigateUp,
         title = {
             Text(
                 text = stringResource(id = R.string.wireguard_mtu),
@@ -59,7 +70,7 @@ fun MtuDialog(
                     onSubmit = { newMtuValue ->
                         val mtuInt = newMtuValue.toIntOrNull()
                         if (mtuInt?.isValidMtu() == true) {
-                            onSave(mtuInt)
+                            viewModel.onSaveClick(mtuInt)
                         }
                     },
                     isEnabled = true,
@@ -91,7 +102,7 @@ fun MtuDialog(
                     onClick = {
                         val mtuInt = mtu.value.toIntOrNull()
                         if (mtuInt?.isValidMtu() == true) {
-                            onSave(mtuInt)
+                            viewModel.onSaveClick(mtuInt)
                         }
                     }
                 )
@@ -99,13 +110,13 @@ fun MtuDialog(
                 PrimaryButton(
                     modifier = Modifier.fillMaxWidth(),
                     text = stringResource(R.string.reset_to_default_button),
-                    onClick = onRestoreDefaultValue
+                    onClick = viewModel::onRestoreClick
                 )
 
                 PrimaryButton(
                     modifier = Modifier.fillMaxWidth(),
                     text = stringResource(R.string.cancel),
-                    onClick = onDismiss
+                    onClick = navigator::navigateUp
                 )
             }
         },
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ObfuscationInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ObfuscationInfoDialog.kt
index f54eabdbafb5..cf4db26e2e9b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ObfuscationInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ObfuscationInfoDialog.kt
@@ -3,15 +3,23 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 
 @Preview
 @Composable
 private fun PreviewObfuscationInfoDialog() {
-    ObfuscationInfoDialog(onDismiss = {})
+    ObfuscationInfoDialog(EmptyDestinationsNavigator)
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun ObfuscationInfoDialog(onDismiss: () -> Unit) {
-    InfoDialog(message = stringResource(id = R.string.obfuscation_info), onDismiss = onDismiss)
+fun ObfuscationInfoDialog(navigator: DestinationsNavigator) {
+    InfoDialog(
+        message = stringResource(id = R.string.obfuscation_info),
+        onDismiss = navigator::navigateUp
+    )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/QuantumResistanceInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/QuantumResistanceInfoDialog.kt
index 3a20e9c80576..e7773ed0a382 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/QuantumResistanceInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/QuantumResistanceInfoDialog.kt
@@ -3,19 +3,24 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 
 @Preview
 @Composable
 private fun PreviewQuantumResistanceInfoDialog() {
-    QuantumResistanceInfoDialog(onDismiss = {})
+    QuantumResistanceInfoDialog(EmptyDestinationsNavigator)
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun QuantumResistanceInfoDialog(onDismiss: () -> Unit) {
+fun QuantumResistanceInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message = stringResource(id = R.string.quantum_resistant_info_first_paragaph),
         additionalInfo = stringResource(id = R.string.quantum_resistant_info_second_paragaph),
-        onDismiss = onDismiss
+        onDismiss = navigator::navigateUp
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt
index c5b619a9cd2d..8d48a3ecbd94 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RedeemVoucherDialog.kt
@@ -12,6 +12,7 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
@@ -22,6 +23,9 @@ import androidx.compose.ui.tooling.preview.Devices
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.window.SecureFlagPolicy
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.BuildConfig
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
@@ -36,7 +40,9 @@ import net.mullvad.mullvadvpn.constant.VOUCHER_LENGTH
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaDescription
+import net.mullvad.mullvadvpn.viewmodel.VoucherDialogViewModel
 import org.joda.time.DateTimeConstants
+import org.koin.androidx.compose.koinViewModel
 
 @Preview(device = Devices.TV_720p)
 @Composable
@@ -90,6 +96,18 @@ private fun PreviewRedeemVoucherDialogSuccess() {
     }
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
+@Composable
+fun RedeemVoucher(resultBackNavigator: ResultBackNavigator<Boolean>) {
+    val vm = koinViewModel<VoucherDialogViewModel>()
+    RedeemVoucherDialog(
+        uiState = vm.uiState.collectAsState().value,
+        onVoucherInputChange = { vm.onVoucherInputChange(it) },
+        onRedeem = { vm.onRedeem(it) },
+        onDismiss = { resultBackNavigator.navigateBack(result = it) }
+    )
+}
+
 @Composable
 fun RedeemVoucherDialog(
     uiState: VoucherDialogUiState,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RemoveDeviceConfirmationDialog.kt
similarity index 73%
rename from android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt
rename to android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RemoveDeviceConfirmationDialog.kt
index d99f9e62b7ee..97fff0ff2716 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DeviceRemovalDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/RemoveDeviceConfirmationDialog.kt
@@ -18,27 +18,34 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.result.EmptyResultBackNavigator
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.NegativeButton
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
 import net.mullvad.mullvadvpn.compose.component.HtmlText
 import net.mullvad.mullvadvpn.compose.component.textResource
+import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.model.Device
 
 @Preview
 @Composable
-private fun PreviewShowDeviceRemovalDialog() {
-    DeviceRemovalDialog(
-        onDismiss = {},
-        onConfirm = {},
-        device = Device("test", "test", byteArrayOf(), "test")
-    )
+private fun PreviewShowDefalseviceRemovalDialog() {
+    AppTheme {
+        RemoveDeviceConfirmationDialog(
+            EmptyResultBackNavigator(),
+            device = Device("test", "test", byteArrayOf(), "test")
+        )
+    }
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun DeviceRemovalDialog(onDismiss: () -> Unit, onConfirm: () -> Unit, device: Device) {
+fun RemoveDeviceConfirmationDialog(navigator: ResultBackNavigator<String>, device: Device) {
     AlertDialog(
-        onDismissRequest = onDismiss,
+        onDismissRequest = { navigator.navigateBack() },
         title = {
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
@@ -62,14 +69,14 @@ fun DeviceRemovalDialog(onDismiss: () -> Unit, onConfirm: () -> Unit, device: De
         },
         dismissButton = {
             NegativeButton(
-                onClick = onConfirm,
+                onClick = { navigator.navigateBack(result = device.id) },
                 text = stringResource(id = R.string.confirm_removal)
             )
         },
         confirmButton = {
             PrimaryButton(
                 modifier = Modifier.focusRequester(FocusRequester()),
-                onClick = onDismiss,
+                onClick = { navigator.navigateBack() },
                 text = stringResource(id = R.string.back)
             )
         },
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
index 1e2da9f95100..446e48aab968 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ReportProblemNoEmailDialog.kt
@@ -12,6 +12,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.result.EmptyResultBackNavigator
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.NegativeButton
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
@@ -21,18 +25,14 @@ import net.mullvad.mullvadvpn.lib.theme.Dimens
 @Preview
 @Composable
 private fun PreviewReportProblemNoEmailDialog() {
-    AppTheme {
-        ReportProblemNoEmailDialog(
-            onDismiss = {},
-            onConfirm = {},
-        )
-    }
+    AppTheme { ReportProblemNoEmailDialog(EmptyResultBackNavigator()) }
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun ReportProblemNoEmailDialog(onDismiss: () -> Unit, onConfirm: () -> Unit) {
+fun ReportProblemNoEmailDialog(resultBackNavigator: ResultBackNavigator<Boolean>) {
     AlertDialog(
-        onDismissRequest = { onDismiss() },
+        onDismissRequest = { resultBackNavigator.navigateBack() },
         icon = {
             Icon(
                 painter = painterResource(id = R.drawable.icon_alert),
@@ -52,14 +52,14 @@ fun ReportProblemNoEmailDialog(onDismiss: () -> Unit, onConfirm: () -> Unit) {
         dismissButton = {
             NegativeButton(
                 modifier = Modifier.fillMaxWidth(),
-                onClick = onConfirm,
+                onClick = { resultBackNavigator.navigateBack(result = true) },
                 text = stringResource(id = R.string.send_anyway)
             )
         },
         confirmButton = {
             PrimaryButton(
                 modifier = Modifier.fillMaxWidth(),
-                onClick = { onDismiss() },
+                onClick = { resultBackNavigator.navigateBack() },
                 text = stringResource(id = R.string.back)
             )
         },
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/UdpOverTcpPortInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/UdpOverTcpPortInfoDialog.kt
index f81412799063..1c5c4ccef636 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/UdpOverTcpPortInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/UdpOverTcpPortInfoDialog.kt
@@ -3,18 +3,24 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.lib.theme.AppTheme
 
 @Preview
 @Composable
 private fun PreviewUdpOverTcpPortInfoDialog() {
-    UdpOverTcpPortInfoDialog(onDismiss = {})
+    AppTheme { UdpOverTcpPortInfoDialog(EmptyDestinationsNavigator) }
 }
 
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun UdpOverTcpPortInfoDialog(onDismiss: () -> Unit) {
+fun UdpOverTcpPortInfoDialog(navigator: DestinationsNavigator) {
     InfoDialog(
         message = stringResource(id = R.string.udp_over_tcp_port_info),
-        onDismiss = onDismiss
+        onDismiss = navigator::navigateUp
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardCustomPortDialog.kt
similarity index 63%
rename from android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt
rename to android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardCustomPortDialog.kt
index a30e525e6d59..b2ad37b19557 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/CustomPortDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardCustomPortDialog.kt
@@ -1,5 +1,6 @@
 package net.mullvad.mullvadvpn.compose.dialog
 
+import android.os.Parcelable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -15,6 +16,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.result.EmptyResultBackNavigator
+import com.ramcosta.composedestinations.result.ResultBackNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
+import kotlinx.parcelize.Parcelize
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.NegativeButton
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
@@ -29,29 +35,31 @@ import net.mullvad.mullvadvpn.util.isPortInValidRanges
 
 @Preview
 @Composable
-private fun PreviewCustomPortDialog() {
+private fun PreviewWireguardCustomPortDialog() {
     AppTheme {
-        CustomPortDialog(
-            onSave = {},
-            onReset = {},
-            customPort = "",
-            allowedPortRanges = listOf(PortRange(10, 10), PortRange(40, 50)),
-            showReset = true,
-            onDismissRequest = {}
+        WireguardCustomPortDialog(
+            WireguardCustomPortNavArgs(
+                customPort = null,
+                allowedPortRanges = listOf(PortRange(10, 10), PortRange(40, 50)),
+            ),
+            EmptyResultBackNavigator()
         )
     }
 }
 
+@Parcelize
+data class WireguardCustomPortNavArgs(
+    val customPort: Int?,
+    val allowedPortRanges: List<PortRange>,
+) : Parcelable
+
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun CustomPortDialog(
-    customPort: String,
-    allowedPortRanges: List<PortRange>,
-    showReset: Boolean,
-    onSave: (customPortString: String) -> Unit,
-    onReset: () -> Unit,
-    onDismissRequest: () -> Unit
+fun WireguardCustomPortDialog(
+    navArg: WireguardCustomPortNavArgs,
+    backNavigator: ResultBackNavigator<Int?>
 ) {
-    val port = remember { mutableStateOf(customPort) }
+    val port = remember { mutableStateOf(navArg.customPort?.toString() ?: "") }
 
     AlertDialog(
         title = {
@@ -64,20 +72,22 @@ fun CustomPortDialog(
             Column(verticalArrangement = Arrangement.spacedBy(Dimens.buttonSpacing)) {
                 PrimaryButton(
                     text = stringResource(id = R.string.custom_port_dialog_submit),
-                    onClick = { onSave(port.value) },
+                    onClick = { backNavigator.navigateBack(port.value.toInt()) },
                     isEnabled =
                         port.value.isNotEmpty() &&
-                            allowedPortRanges.isPortInValidRanges(port.value.toIntOrNull() ?: 0)
+                            navArg.allowedPortRanges.isPortInValidRanges(
+                                port.value.toIntOrNull() ?: 0
+                            )
                 )
-                if (showReset) {
+                if (navArg.customPort != null) {
                     NegativeButton(
                         text = stringResource(R.string.custom_port_dialog_remove),
-                        onClick = onReset
+                        onClick = { backNavigator.navigateBack(null) }
                     )
                 }
                 PrimaryButton(
                     text = stringResource(id = R.string.cancel),
-                    onClick = onDismissRequest
+                    onClick = backNavigator::navigateBack
                 )
             }
         },
@@ -88,15 +98,19 @@ fun CustomPortDialog(
                     onSubmit = { input ->
                         if (
                             input.isNotEmpty() &&
-                                allowedPortRanges.isPortInValidRanges(input.toIntOrNull() ?: 0)
+                                navArg.allowedPortRanges.isPortInValidRanges(
+                                    input.toIntOrNull() ?: 0
+                                )
                         ) {
-                            onSave(input)
+                            backNavigator.navigateBack(result = input.toIntOrNull())
                         }
                     },
                     onValueChanged = { input -> port.value = input },
                     isValidValue =
                         port.value.isNotEmpty() &&
-                            allowedPortRanges.isPortInValidRanges(port.value.toIntOrNull() ?: 0),
+                            navArg.allowedPortRanges.isPortInValidRanges(
+                                port.value.toIntOrNull() ?: 0
+                            ),
                     maxCharLength = 5,
                     modifier = Modifier.testTag(CUSTOM_PORT_DIALOG_INPUT_TEST_TAG).fillMaxWidth()
                 )
@@ -105,7 +119,7 @@ fun CustomPortDialog(
                     text =
                         stringResource(
                             id = R.string.custom_port_dialog_valid_ranges,
-                            allowedPortRanges.asString()
+                            navArg.allowedPortRanges.asString()
                         ),
                     color = MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaDescription),
                     style = MaterialTheme.typography.bodySmall
@@ -114,6 +128,6 @@ fun CustomPortDialog(
         },
         containerColor = MaterialTheme.colorScheme.background,
         titleContentColor = MaterialTheme.colorScheme.onBackground,
-        onDismissRequest = onDismissRequest
+        onDismissRequest = backNavigator::navigateBack
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardPortInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardPortInfoDialog.kt
index 58ddb00e2033..a3329b1248b2 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardPortInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/WireguardPortInfoDialog.kt
@@ -1,24 +1,45 @@
 package net.mullvad.mullvadvpn.compose.dialog
 
+import android.os.Parcelable
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.EmptyDestinationsNavigator
+import com.ramcosta.composedestinations.spec.DestinationStyle
+import kotlinx.parcelize.Parcelize
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.model.PortRange
 import net.mullvad.mullvadvpn.util.asString
 
 @Preview
 @Composable
 private fun PreviewWireguardPortInfoDialog() {
-    WireguardPortInfoDialog(portRanges = listOf(PortRange(1, 2)), onDismiss = {})
+    AppTheme {
+        WireguardPortInfoDialog(
+            EmptyDestinationsNavigator,
+            argument = WireguardPortInfoDialogArgument(listOf(PortRange(1, 2)))
+        )
+    }
 }
 
+@Parcelize data class WireguardPortInfoDialogArgument(val portRanges: List<PortRange>) : Parcelable
+
+@Destination(style = DestinationStyle.Dialog::class)
 @Composable
-fun WireguardPortInfoDialog(portRanges: List<PortRange>, onDismiss: () -> Unit) {
+fun WireguardPortInfoDialog(
+    navigator: DestinationsNavigator,
+    argument: WireguardPortInfoDialogArgument
+) {
     InfoDialog(
         message = stringResource(id = R.string.wireguard_port_info_description),
         additionalInfo =
-            stringResource(id = R.string.wireguard_port_info_port_range, portRanges.asString()),
-        onDismiss = onDismiss
+            stringResource(
+                id = R.string.wireguard_port_info_port_range,
+                argument.portRanges.asString()
+            ),
+        onDismiss = navigator::navigateUp
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
index fecd23406a8f..9a9adab5717b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt
@@ -1,6 +1,7 @@
 package net.mullvad.mullvadvpn.compose.screen
 
 import android.app.Activity
+import android.os.Build
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -13,25 +14,32 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.popUpTo
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.NavGraphs
 import net.mullvad.mullvadvpn.compose.button.ExternalButton
 import net.mullvad.mullvadvpn.compose.button.NegativeButton
 import net.mullvad.mullvadvpn.compose.button.RedeemVoucherButton
@@ -41,12 +49,15 @@ import net.mullvad.mullvadvpn.compose.component.MissingPolicy
 import net.mullvad.mullvadvpn.compose.component.NavigateBackDownIconButton
 import net.mullvad.mullvadvpn.compose.component.PlayPayment
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithMediumTopBar
-import net.mullvad.mullvadvpn.compose.dialog.DeviceNameInfoDialog
+import net.mullvad.mullvadvpn.compose.destinations.DeviceNameInfoDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.LoginDestination
+import net.mullvad.mullvadvpn.compose.destinations.RedeemVoucherDestination
 import net.mullvad.mullvadvpn.compose.dialog.payment.PaymentDialog
 import net.mullvad.mullvadvpn.compose.dialog.payment.VerificationPendingDialog
-import net.mullvad.mullvadvpn.compose.extensions.createOpenAccountPageHook
 import net.mullvad.mullvadvpn.compose.state.PaymentState
+import net.mullvad.mullvadvpn.compose.transitions.SlideInFromBottomTransition
 import net.mullvad.mullvadvpn.compose.util.SecureScreenWhileInView
+import net.mullvad.mullvadvpn.constant.IS_PLAY_BUILD
 import net.mullvad.mullvadvpn.lib.common.util.openAccountPageInBrowser
 import net.mullvad.mullvadvpn.lib.payment.model.PaymentProduct
 import net.mullvad.mullvadvpn.lib.payment.model.PaymentStatus
@@ -58,6 +69,7 @@ import net.mullvad.mullvadvpn.util.toExpiryDateString
 import net.mullvad.mullvadvpn.viewmodel.AccountUiState
 import net.mullvad.mullvadvpn.viewmodel.AccountViewModel
 import org.joda.time.DateTime
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Preview
@@ -65,7 +77,6 @@ import org.joda.time.DateTime
 private fun PreviewAccountScreen() {
     AppTheme {
         AccountScreen(
-            showSitePayment = true,
             uiState =
                 AccountUiState(
                     deviceName = "Test Name",
@@ -88,18 +99,46 @@ private fun PreviewAccountScreen() {
                         )
                 ),
             uiSideEffect = MutableSharedFlow<AccountViewModel.UiSideEffect>().asSharedFlow(),
-            enterTransitionEndAction = MutableSharedFlow()
         )
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Destination(style = SlideInFromBottomTransition::class)
+@Composable
+fun Account(
+    navigator: DestinationsNavigator,
+) {
+    val vm = koinViewModel<AccountViewModel>()
+    val state by vm.uiState.collectAsState()
+
+    AccountScreen(
+        uiState = state,
+        uiSideEffect = vm.uiSideEffect,
+        onRedeemVoucherClick = {
+            navigator.navigate(RedeemVoucherDestination) { launchSingleTop = true }
+        },
+        onManageAccountClick = vm::onManageAccountClick,
+        onLogoutClick = vm::onLogoutClick,
+        navigateToLogin = {
+            navigator.navigate(LoginDestination(null)) {
+                popUpTo(NavGraphs.root) { inclusive = true }
+            }
+        },
+        onCopyAccountNumber = vm::onCopyAccountNumber,
+        onBackClick = { navigator.navigateUp() },
+        navigateToDeviceInfo = {
+            navigator.navigate(DeviceNameInfoDialogDestination) { launchSingleTop = true }
+        }
+    )
+}
+
 @ExperimentalMaterial3Api
 @Composable
 fun AccountScreen(
-    showSitePayment: Boolean,
     uiState: AccountUiState,
     uiSideEffect: SharedFlow<AccountViewModel.UiSideEffect>,
-    enterTransitionEndAction: SharedFlow<Unit>,
+    onCopyAccountNumber: (String) -> Unit = {},
     onRedeemVoucherClick: () -> Unit = {},
     onManageAccountClick: () -> Unit = {},
     onLogoutClick: () -> Unit = {},
@@ -108,34 +147,37 @@ fun AccountScreen(
         { _, _ ->
         },
     onClosePurchaseResultDialog: (success: Boolean) -> Unit = {},
+    navigateToLogin: () -> Unit = {},
+    navigateToDeviceInfo: () -> Unit = {},
     onBackClick: () -> Unit = {}
 ) {
     // This will enable SECURE_FLAG while this screen is visible to preview screenshot
     SecureScreenWhileInView()
 
     val context = LocalContext.current
-    val backgroundColor = MaterialTheme.colorScheme.background
-    val systemUiController = rememberSystemUiController()
-    var showDeviceNameInfoDialog by remember { mutableStateOf(false) }
-    var showVerificationPendingDialog by remember { mutableStateOf(false) }
-
-    LaunchedEffect(Unit) {
-        systemUiController.setNavigationBarColor(backgroundColor)
-        enterTransitionEndAction.collect { systemUiController.setStatusBarColor(backgroundColor) }
-    }
-    val openAccountPage = LocalUriHandler.current.createOpenAccountPageHook()
+    val clipboardManager = LocalClipboardManager.current
+    val snackbarHostState = remember { SnackbarHostState() }
+    val copyTextString = stringResource(id = R.string.copied_mullvad_account_number)
     LaunchedEffect(Unit) {
-        uiSideEffect.collect { viewAction ->
-            if (viewAction is AccountViewModel.UiSideEffect.OpenAccountManagementPageInBrowser) {
-                openAccountPage(viewAction.token)
+        uiSideEffect.collect { uiSideEffect ->
+            when (uiSideEffect) {
+                AccountViewModel.UiSideEffect.NavigateToLogin -> navigateToLogin()
+                is AccountViewModel.UiSideEffect.OpenAccountManagementPageInBrowser ->
+                    context.openAccountPageInBrowser(uiSideEffect.token)
+                is AccountViewModel.UiSideEffect.CopyAccountNumber ->
+                    launch {
+                        clipboardManager.setText(AnnotatedString(uiSideEffect.accountNumber))
+
+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+                            snackbarHostState.currentSnackbarData?.dismiss()
+                            snackbarHostState.showSnackbar(message = copyTextString)
+                        }
+                    }
             }
         }
     }
 
-    if (showDeviceNameInfoDialog) {
-        DeviceNameInfoDialog { showDeviceNameInfoDialog = false }
-    }
-
+    var showVerificationPendingDialog by remember { mutableStateOf(false) }
     if (showVerificationPendingDialog) {
         VerificationPendingDialog(onClose = { showVerificationPendingDialog = false })
     }
@@ -147,15 +189,6 @@ fun AccountScreen(
             onCloseDialog = onClosePurchaseResultDialog
         )
     }
-
-    LaunchedEffect(Unit) {
-        uiSideEffect.collect { uiSideEffect ->
-            if (uiSideEffect is AccountViewModel.UiSideEffect.OpenAccountManagementPageInBrowser) {
-                context.openAccountPageInBrowser(uiSideEffect.token)
-            }
-        }
-    }
-
     ScaffoldWithMediumTopBar(
         appBarTitle = stringResource(id = R.string.settings_account),
         navigationIcon = { NavigateBackDownIconButton(onBackClick) }
@@ -165,9 +198,9 @@ fun AccountScreen(
             verticalArrangement = Arrangement.spacedBy(Dimens.accountRowSpacing),
             modifier = modifier.animateContentSize().padding(horizontal = Dimens.sideMargin)
         ) {
-            DeviceNameRow(deviceName = uiState.deviceName ?: "") { showDeviceNameInfoDialog = true }
+            DeviceNameRow(deviceName = uiState.deviceName ?: "", onInfoClick = navigateToDeviceInfo)
 
-            AccountNumberRow(accountNumber = uiState.accountNumber ?: "")
+            AccountNumberRow(accountNumber = uiState.accountNumber ?: "", onCopyAccountNumber)
 
             PaidUntilRow(accountExpiry = uiState.accountExpiry)
 
@@ -185,7 +218,7 @@ fun AccountScreen(
                     )
                 }
 
-                if (showSitePayment) {
+                if (IS_PLAY_BUILD.not()) {
                     ExternalButton(
                         text = stringResource(id = R.string.manage_account),
                         onClick = onManageAccountClick,
@@ -230,7 +263,7 @@ private fun DeviceNameRow(deviceName: String, onInfoClick: () -> Unit) {
 }
 
 @Composable
-private fun AccountNumberRow(accountNumber: String) {
+private fun AccountNumberRow(accountNumber: String, onCopyAccountNumber: (String) -> Unit) {
     Column(modifier = Modifier.fillMaxWidth()) {
         Text(
             style = MaterialTheme.typography.labelMedium,
@@ -238,6 +271,7 @@ private fun AccountNumberRow(accountNumber: String) {
         )
         CopyableObfuscationView(
             content = accountNumber,
+            onCopyClicked = { onCopyAccountNumber(accountNumber) },
             modifier = Modifier.heightIn(min = Dimens.accountRowMinHeight).fillMaxWidth()
         )
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
index 7528b46e425e..037ec9d264a0 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt
@@ -1,5 +1,7 @@
 package net.mullvad.mullvadvpn.compose.screen
 
+import android.content.Intent
+import android.net.Uri
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -14,6 +16,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.remember
@@ -24,11 +27,11 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.popUpTo
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.NavGraphs
 import net.mullvad.mullvadvpn.compose.button.ConnectionButton
 import net.mullvad.mullvadvpn.compose.button.SwitchLocationButton
 import net.mullvad.mullvadvpn.compose.component.ConnectionStatusText
@@ -37,6 +40,10 @@ import net.mullvad.mullvadvpn.compose.component.MullvadCircularProgressIndicator
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBarAndDeviceName
 import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar
 import net.mullvad.mullvadvpn.compose.component.notificationbanner.NotificationBanner
+import net.mullvad.mullvadvpn.compose.destinations.AccountDestination
+import net.mullvad.mullvadvpn.compose.destinations.OutOfTimeDestination
+import net.mullvad.mullvadvpn.compose.destinations.SelectLocationDestination
+import net.mullvad.mullvadvpn.compose.destinations.SettingsDestination
 import net.mullvad.mullvadvpn.compose.state.ConnectUiState
 import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR
 import net.mullvad.mullvadvpn.compose.test.CONNECT_BUTTON_TEST_TAG
@@ -44,14 +51,17 @@ import net.mullvad.mullvadvpn.compose.test.LOCATION_INFO_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.RECONNECT_BUTTON_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.SCROLLABLE_COLUMN_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.SELECT_LOCATION_BUTTON_TEST_TAG
+import net.mullvad.mullvadvpn.compose.transitions.NoTransition
 import net.mullvad.mullvadvpn.lib.common.util.openAccountPageInBrowser
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaTopBar
 import net.mullvad.mullvadvpn.model.TunnelState
+import net.mullvad.mullvadvpn.util.appendHideNavOnPlayBuild
 import net.mullvad.mullvadvpn.viewmodel.ConnectViewModel
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
+import org.koin.androidx.compose.koinViewModel
 
 private const val CONNECT_BUTTON_THROTTLE_MILLIS = 1000
 
@@ -62,16 +72,64 @@ private fun PreviewConnectScreen() {
     AppTheme {
         ConnectScreen(
             uiState = state,
-            uiSideEffect = MutableSharedFlow<ConnectViewModel.UiSideEffect>().asSharedFlow()
         )
     }
 }
 
+@Destination(style = NoTransition::class)
+@Composable
+fun Connect(navigator: DestinationsNavigator) {
+    val connectViewModel: ConnectViewModel = koinViewModel()
+
+    val state = connectViewModel.uiState.collectAsState().value
+
+    val context = LocalContext.current
+    LaunchedEffect(key1 = Unit) {
+        connectViewModel.uiSideEffect.collect { uiSideEffect ->
+            when (uiSideEffect) {
+                is ConnectViewModel.UiSideEffect.OpenAccountManagementPageInBrowser -> {
+                    context.openAccountPageInBrowser(uiSideEffect.token)
+                }
+                is ConnectViewModel.UiSideEffect.OutOfTime -> {
+                    navigator.navigate(OutOfTimeDestination) {
+                        launchSingleTop = true
+                        popUpTo(NavGraphs.root) { inclusive = true }
+                    }
+                }
+            }
+        }
+    }
+    ConnectScreen(
+        uiState = state,
+        onDisconnectClick = connectViewModel::onDisconnectClick,
+        onReconnectClick = connectViewModel::onReconnectClick,
+        onConnectClick = connectViewModel::onConnectClick,
+        onCancelClick = connectViewModel::onCancelClick,
+        onSwitchLocationClick = {
+            navigator.navigate(SelectLocationDestination) { launchSingleTop = true }
+        },
+        onToggleTunnelInfo = connectViewModel::toggleTunnelInfoExpansion,
+        onUpdateVersionClick = {
+            val intent =
+                Intent(
+                        Intent.ACTION_VIEW,
+                        Uri.parse(
+                            context.getString(R.string.download_url).appendHideNavOnPlayBuild()
+                        )
+                    )
+                    .apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK }
+            context.startActivity(intent)
+        },
+        onManageAccountClick = connectViewModel::onManageAccountClick,
+        onSettingsClick = { navigator.navigate(SettingsDestination) { launchSingleTop = true } },
+        onAccountClick = { navigator.navigate(AccountDestination) { launchSingleTop = true } },
+        onDismissNewDeviceClick = connectViewModel::dismissNewDeviceNotification,
+    )
+}
+
 @Composable
 fun ConnectScreen(
     uiState: ConnectUiState,
-    uiSideEffect: SharedFlow<ConnectViewModel.UiSideEffect>,
-    drawNavigationBar: Boolean = false,
     onDisconnectClick: () -> Unit = {},
     onReconnectClick: () -> Unit = {},
     onConnectClick: () -> Unit = {},
@@ -80,33 +138,10 @@ fun ConnectScreen(
     onToggleTunnelInfo: () -> Unit = {},
     onUpdateVersionClick: () -> Unit = {},
     onManageAccountClick: () -> Unit = {},
-    onOpenOutOfTimeScreen: () -> Unit = {},
     onSettingsClick: () -> Unit = {},
     onAccountClick: () -> Unit = {},
     onDismissNewDeviceClick: () -> Unit = {}
 ) {
-    val context = LocalContext.current
-
-    val systemUiController = rememberSystemUiController()
-    val navigationBarColor = MaterialTheme.colorScheme.primary
-    val setSystemBarColor = { systemUiController.setNavigationBarColor(navigationBarColor) }
-    LaunchedEffect(drawNavigationBar) {
-        if (drawNavigationBar) {
-            setSystemBarColor()
-        }
-    }
-    LaunchedEffect(key1 = Unit) {
-        uiSideEffect.collect { uiSideEffect ->
-            when (uiSideEffect) {
-                is ConnectViewModel.UiSideEffect.OpenAccountManagementPageInBrowser -> {
-                    context.openAccountPageInBrowser(uiSideEffect.token)
-                }
-                is ConnectViewModel.UiSideEffect.OpenOutOfTimeView -> {
-                    onOpenOutOfTimeScreen()
-                }
-            }
-        }
-    }
 
     val scrollState = rememberScrollState()
     var lastConnectionActionTimestamp by remember { mutableLongStateOf(0L) }
@@ -126,13 +161,6 @@ fun ConnectScreen(
             } else {
                 MaterialTheme.colorScheme.error
             },
-        statusBarColor =
-            if (uiState.tunnelUiState.isSecured()) {
-                MaterialTheme.colorScheme.inversePrimary
-            } else {
-                MaterialTheme.colorScheme.error
-            },
-        navigationBarColor = null,
         iconTintColor =
             if (uiState.tunnelUiState.isSecured()) {
                     MaterialTheme.colorScheme.onPrimary
@@ -149,8 +177,8 @@ fun ConnectScreen(
             verticalArrangement = Arrangement.Bottom,
             horizontalAlignment = Alignment.Start,
             modifier =
-                Modifier.padding(it)
-                    .background(color = MaterialTheme.colorScheme.primary)
+                Modifier.background(color = MaterialTheme.colorScheme.primary)
+                    .padding(it)
                     .fillMaxHeight()
                     .drawVerticalScrollbar(
                         scrollState,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
index 1617c1fb7a5a..dd9d2e94ee1f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
@@ -17,20 +17,29 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.popUpTo
+import com.ramcosta.composedestinations.result.NavResult
+import com.ramcosta.composedestinations.result.ResultRecipient
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
 import net.mullvad.mullvadvpn.compose.button.VariantButton
 import net.mullvad.mullvadvpn.compose.cell.BaseCell
 import net.mullvad.mullvadvpn.compose.component.MullvadCircularProgressIndicatorMedium
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar
+import net.mullvad.mullvadvpn.compose.destinations.LoginDestination
+import net.mullvad.mullvadvpn.compose.destinations.RemoveDeviceConfirmationDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.SettingsDestination
 import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar
-import net.mullvad.mullvadvpn.compose.dialog.DeviceRemovalDialog
 import net.mullvad.mullvadvpn.compose.state.DeviceListItemUiState
 import net.mullvad.mullvadvpn.compose.state.DeviceListUiState
 import net.mullvad.mullvadvpn.lib.common.util.parseAsDateTime
@@ -42,6 +51,8 @@ import net.mullvad.mullvadvpn.lib.theme.typeface.listItemSubText
 import net.mullvad.mullvadvpn.lib.theme.typeface.listItemText
 import net.mullvad.mullvadvpn.model.Device
 import net.mullvad.mullvadvpn.util.formatDate
+import net.mullvad.mullvadvpn.viewmodel.DeviceListViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Composable
 @Preview
@@ -63,35 +74,62 @@ private fun PreviewDeviceListScreen() {
                                 isLoading = false
                             )
                         ),
-                    isLoading = true,
-                    stagedDevice = null
+                    isLoading = true
                 )
         )
     }
 }
 
+@Destination
+@Composable
+fun DeviceList(
+    navigator: DestinationsNavigator,
+    accountToken: String,
+    backResultBackNavigator: ResultRecipient<RemoveDeviceConfirmationDialogDestination, String>
+) {
+    val viewModel = koinViewModel<DeviceListViewModel>()
+    val state by viewModel.uiState.collectAsState()
+
+    backResultBackNavigator.onNavResult {
+        when (it) {
+            NavResult.Canceled -> {
+                /* Do nothing */
+            }
+            is NavResult.Value -> {
+                viewModel.removeDevice(accountToken = accountToken, deviceIdToRemove = it.value)
+            }
+        }
+    }
+
+    DeviceListScreen(
+        state = state,
+        onBackClick = navigator::navigateUp,
+        onContinueWithLogin = {
+            navigator.navigate(LoginDestination(accountToken)) {
+                launchSingleTop = true
+                popUpTo(LoginDestination) { inclusive = true }
+            }
+        },
+        onSettingsClicked = { navigator.navigate(SettingsDestination) { launchSingleTop = true } },
+        navigateToRemoveDeviceConfirmationDialog = {
+            navigator.navigate(RemoveDeviceConfirmationDialogDestination(it)) {
+                launchSingleTop = true
+            }
+        }
+    )
+}
+
 @Composable
 fun DeviceListScreen(
     state: DeviceListUiState,
     onBackClick: () -> Unit = {},
     onContinueWithLogin: () -> Unit = {},
     onSettingsClicked: () -> Unit = {},
-    onDeviceRemovalClicked: (deviceId: String) -> Unit = {},
-    onDismissDeviceRemovalDialog: () -> Unit = {},
-    onConfirmDeviceRemovalDialog: () -> Unit = {}
+    navigateToRemoveDeviceConfirmationDialog: (device: Device) -> Unit = {}
 ) {
-    if (state.stagedDevice != null) {
-        DeviceRemovalDialog(
-            onDismiss = onDismissDeviceRemovalDialog,
-            onConfirmDeviceRemovalDialog,
-            device = state.stagedDevice
-        )
-    }
 
     ScaffoldWithTopBar(
         topBarColor = MaterialTheme.colorScheme.primary,
-        statusBarColor = MaterialTheme.colorScheme.primary,
-        navigationBarColor = MaterialTheme.colorScheme.background,
         iconTintColor = MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaTopBar),
         onSettingsClicked = onSettingsClicked,
         onAccountClicked = null,
@@ -115,7 +153,7 @@ fun DeviceListScreen(
                     DeviceListItem(
                         deviceUiState = deviceUiState,
                     ) {
-                        onDeviceRemovalClicked(deviceUiState.device.id)
+                        navigateToRemoveDeviceConfirmationDialog(deviceUiState.device)
                     }
                     if (state.deviceUiItems.lastIndex != index) {
                         Divider()
@@ -244,7 +282,6 @@ private fun DeviceListButtonPanel(
     onContinueWithLogin: () -> Unit,
     onBackClick: () -> Unit
 ) {
-
     Column(
         modifier =
             Modifier.padding(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt
index 5ec6b9a64ba6..11e929c905e9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceRevokedScreen.kt
@@ -3,14 +3,15 @@ package net.mullvad.mullvadvpn.compose.screen
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
@@ -21,12 +22,20 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.popUpTo
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.NavGraphs
 import net.mullvad.mullvadvpn.compose.button.DeviceRevokedLoginButton
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar
+import net.mullvad.mullvadvpn.compose.destinations.LoginDestination
+import net.mullvad.mullvadvpn.compose.destinations.SettingsDestination
 import net.mullvad.mullvadvpn.compose.state.DeviceRevokedUiState
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
+import net.mullvad.mullvadvpn.viewmodel.DeviceRevokedViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
@@ -34,6 +43,24 @@ private fun PreviewDeviceRevokedScreen() {
     AppTheme { DeviceRevokedScreen(state = DeviceRevokedUiState.SECURED) }
 }
 
+@Destination
+@Composable
+fun DeviceRevoked(navigator: DestinationsNavigator) {
+    val viewModel = koinViewModel<DeviceRevokedViewModel>()
+
+    val state by viewModel.uiState.collectAsState()
+    DeviceRevokedScreen(
+        state = state,
+        onSettingsClicked = { navigator.navigate(SettingsDestination) { launchSingleTop = true } },
+        onGoToLoginClicked = {
+            navigator.navigate(LoginDestination(null)) {
+                launchSingleTop = true
+                popUpTo(NavGraphs.root) { inclusive = true }
+            }
+        }
+    )
+}
+
 @Composable
 fun DeviceRevokedScreen(
     state: DeviceRevokedUiState,
@@ -49,15 +76,12 @@ fun DeviceRevokedScreen(
 
     ScaffoldWithTopBar(
         topBarColor = topColor,
-        statusBarColor = topColor,
-        navigationBarColor = MaterialTheme.colorScheme.background,
         onSettingsClicked = onSettingsClicked,
         onAccountClicked = null
     ) {
         ConstraintLayout(
             modifier =
-                Modifier.fillMaxHeight()
-                    .fillMaxWidth()
+                Modifier.fillMaxSize()
                     .padding(it)
                     .background(color = MaterialTheme.colorScheme.background)
         ) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
index e7d6e40a60c6..06682ff5e32b 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoginScreen.kt
@@ -26,6 +26,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -50,11 +52,19 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.popUpTo
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.NavGraphs
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
 import net.mullvad.mullvadvpn.compose.button.VariantButton
 import net.mullvad.mullvadvpn.compose.component.MullvadCircularProgressIndicatorLarge
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar
+import net.mullvad.mullvadvpn.compose.destinations.ConnectDestination
+import net.mullvad.mullvadvpn.compose.destinations.DeviceListDestination
+import net.mullvad.mullvadvpn.compose.destinations.SettingsDestination
+import net.mullvad.mullvadvpn.compose.destinations.WelcomeDestination
 import net.mullvad.mullvadvpn.compose.state.LoginError
 import net.mullvad.mullvadvpn.compose.state.LoginState
 import net.mullvad.mullvadvpn.compose.state.LoginState.*
@@ -66,6 +76,9 @@ import net.mullvad.mullvadvpn.compose.util.accountTokenVisualTransformation
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaTopBar
+import net.mullvad.mullvadvpn.viewmodel.LoginUiSideEffect
+import net.mullvad.mullvadvpn.viewmodel.LoginViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
@@ -99,9 +112,57 @@ private fun PreviewLoginSuccess() {
     AppTheme { LoginScreen(uiState = LoginUiState(loginState = Success)) }
 }
 
+@Destination
+@Composable
+fun Login(
+    navigator: DestinationsNavigator,
+    accountToken: String? = null,
+    vm: LoginViewModel = koinViewModel()
+) {
+    val state by vm.uiState.collectAsState()
+
+    LaunchedEffect(accountToken) {
+        if (accountToken != null) {
+            vm.onAccountNumberChange(accountToken)
+            vm.login(accountToken)
+        }
+    }
+    LaunchedEffect(Unit) {
+        vm.uiSideEffect.collect {
+            when (it) {
+                LoginUiSideEffect.NavigateToWelcome -> {
+                    navigator.navigate(WelcomeDestination) {
+                        launchSingleTop = true
+                        popUpTo(NavGraphs.root) { inclusive = true }
+                    }
+                }
+                LoginUiSideEffect.NavigateToConnect -> {
+                    navigator.navigate(ConnectDestination) {
+                        launchSingleTop = true
+                        popUpTo(NavGraphs.root) { inclusive = true }
+                    }
+                }
+                is LoginUiSideEffect.TooManyDevices -> {
+                    navigator.navigate(DeviceListDestination(it.accountToken.value)) {
+                        launchSingleTop = true
+                    }
+                }
+            }
+        }
+    }
+    LoginScreen(
+        state,
+        vm::login,
+        vm::createAccount,
+        vm::clearAccountHistory,
+        vm::onAccountNumberChange,
+        { navigator.navigate(SettingsDestination) }
+    )
+}
+
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
-fun LoginScreen(
+private fun LoginScreen(
     uiState: LoginUiState,
     onLoginClick: (String) -> Unit = {},
     onCreateAccountClick: () -> Unit = {},
@@ -112,11 +173,10 @@ fun LoginScreen(
     ScaffoldWithTopBar(
         modifier = Modifier.semantics { testTagsAsResourceId = true },
         topBarColor = MaterialTheme.colorScheme.primary,
-        statusBarColor = MaterialTheme.colorScheme.primary,
-        navigationBarColor = MaterialTheme.colorScheme.background,
         iconTintColor = MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaTopBar),
         onSettingsClicked = onSettingsClick,
-        onAccountClicked = null
+        enabled = uiState.loginState is Idle,
+        onAccountClicked = null,
     ) {
         val scrollState = rememberScrollState()
         Column(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/MullvadApp.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/MullvadApp.kt
new file mode 100644
index 000000000000..d2ab1ca2b6dc
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/MullvadApp.kt
@@ -0,0 +1,48 @@
+package net.mullvad.mullvadvpn.compose.screen
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.navigation.NavHostController
+import com.ramcosta.composedestinations.DestinationsNavHost
+import com.ramcosta.composedestinations.rememberNavHostEngine
+import com.ramcosta.composedestinations.utils.destination
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import net.mullvad.mullvadvpn.compose.NavGraphs
+import net.mullvad.mullvadvpn.compose.destinations.ChangelogDestination
+import net.mullvad.mullvadvpn.compose.destinations.ConnectDestination
+import net.mullvad.mullvadvpn.compose.destinations.OutOfTimeDestination
+import net.mullvad.mullvadvpn.viewmodel.ChangelogViewModel
+import org.koin.androidx.compose.koinViewModel
+
+private val changeLogDestinations = listOf(ConnectDestination, OutOfTimeDestination)
+
+@Composable
+fun MullvadApp() {
+    val engine = rememberNavHostEngine()
+    val navController: NavHostController = engine.rememberNavController()
+
+    DestinationsNavHost(
+        modifier = Modifier.fillMaxSize(),
+        engine = engine,
+        navController = navController,
+        navGraph = NavGraphs.root
+    )
+
+    // Dirty way to globally show the changelog
+    val changeLogsViewModel = koinViewModel<ChangelogViewModel>()
+
+    LaunchedEffect(Unit) {
+        changeLogsViewModel.uiSideEffect.collect {
+
+            // Wait until we are in an acceptable destination
+            navController.currentBackStackEntryFlow
+                .map { it.destination() }
+                .first { it in changeLogDestinations }
+
+            navController.navigate(ChangelogDestination(it).route)
+        }
+    }
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
index a7fd6bae2fa0..959268748168 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/OutOfTimeScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -26,20 +27,32 @@ import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.popUpTo
+import com.ramcosta.composedestinations.result.NavResult
+import com.ramcosta.composedestinations.result.ResultRecipient
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.NavGraphs
 import net.mullvad.mullvadvpn.compose.button.NegativeButton
 import net.mullvad.mullvadvpn.compose.button.RedeemVoucherButton
 import net.mullvad.mullvadvpn.compose.button.SitePaymentButton
 import net.mullvad.mullvadvpn.compose.component.PlayPayment
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBarAndDeviceName
 import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar
+import net.mullvad.mullvadvpn.compose.destinations.AccountDestination
+import net.mullvad.mullvadvpn.compose.destinations.ConnectDestination
+import net.mullvad.mullvadvpn.compose.destinations.RedeemVoucherDestination
+import net.mullvad.mullvadvpn.compose.destinations.SettingsDestination
 import net.mullvad.mullvadvpn.compose.dialog.payment.PaymentDialog
 import net.mullvad.mullvadvpn.compose.dialog.payment.VerificationPendingDialog
 import net.mullvad.mullvadvpn.compose.extensions.createOpenAccountPageHook
 import net.mullvad.mullvadvpn.compose.state.OutOfTimeUiState
+import net.mullvad.mullvadvpn.compose.transitions.NoTransition
+import net.mullvad.mullvadvpn.constant.IS_PLAY_BUILD
 import net.mullvad.mullvadvpn.lib.payment.model.ProductId
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
@@ -50,6 +63,7 @@ import net.mullvad.mullvadvpn.viewmodel.OutOfTimeViewModel
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
 import net.mullvad.talpid.tunnel.ErrorState
 import net.mullvad.talpid.tunnel.ErrorStateCause
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
@@ -95,6 +109,45 @@ private fun PreviewOutOfTimeScreenError() {
     }
 }
 
+@Destination(style = NoTransition::class)
+@Composable
+fun OutOfTime(
+    navigator: DestinationsNavigator,
+    resultRecipient: ResultRecipient<RedeemVoucherDestination, Boolean>
+) {
+    val vm = koinViewModel<OutOfTimeViewModel>()
+    val state = vm.uiState.collectAsState().value
+    resultRecipient.onNavResult {
+        // If we successfully redeemed a voucher, navigate to Connect screen
+        if (it is NavResult.Value && it.value) {
+            navigator.navigate(ConnectDestination) {
+                launchSingleTop = true
+                popUpTo(NavGraphs.root) { inclusive = true }
+            }
+        }
+    }
+    OutOfTimeScreen(
+        showSitePayment = IS_PLAY_BUILD.not(),
+        uiState = state,
+        uiSideEffect = vm.uiSideEffect,
+        onSitePaymentClick = vm::onSitePaymentClick,
+        onRedeemVoucherClick = {
+            navigator.navigate(RedeemVoucherDestination) { launchSingleTop = true }
+        },
+        onSettingsClick = { navigator.navigate(SettingsDestination) { launchSingleTop = true } },
+        onAccountClick = { navigator.navigate(AccountDestination) { launchSingleTop = true } },
+        openConnectScreen = {
+            navigator.navigate(ConnectDestination) {
+                launchSingleTop = true
+                popUpTo(NavGraphs.root) { inclusive = true }
+            }
+        },
+        onDisconnectClick = vm::onDisconnectClick,
+        onPurchaseBillingProductClick = vm::startBillingPayment,
+        onClosePurchaseResultDialog = vm::onClosePurchaseResultDialog
+    )
+}
+
 @Composable
 fun OutOfTimeScreen(
     showSitePayment: Boolean,
@@ -143,13 +196,6 @@ fun OutOfTimeScreen(
             } else {
                 MaterialTheme.colorScheme.error
             },
-        statusBarColor =
-            if (uiState.tunnelState.isSecured()) {
-                MaterialTheme.colorScheme.inversePrimary
-            } else {
-                MaterialTheme.colorScheme.error
-            },
-        navigationBarColor = MaterialTheme.colorScheme.background,
         iconTintColor =
             if (uiState.tunnelState.isSecured()) {
                     MaterialTheme.colorScheme.onPrimary
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt
index 02250c36632f..3dab053ea3b9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/PrivacyDisclaimerScreen.kt
@@ -5,8 +5,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
@@ -16,9 +15,11 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
@@ -30,14 +31,23 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.popUpTo
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.NavGraphs
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar
 import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar
+import net.mullvad.mullvadvpn.compose.destinations.LoginDestination
 import net.mullvad.mullvadvpn.compose.util.toDp
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar
+import net.mullvad.mullvadvpn.ui.MainActivity
+import net.mullvad.mullvadvpn.viewmodel.PrivacyDisclaimerUiSideEffect
+import net.mullvad.mullvadvpn.viewmodel.PrivacyDisclaimerViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
@@ -45,24 +55,41 @@ private fun PreviewPrivacyDisclaimerScreen() {
     AppTheme { PrivacyDisclaimerScreen({}, {}) }
 }
 
+@Destination
+@Composable
+fun PrivacyDisclaimer(
+    navigator: DestinationsNavigator,
+) {
+    val viewModel: PrivacyDisclaimerViewModel = koinViewModel()
+
+    val context = LocalContext.current
+    LaunchedEffect(Unit) {
+        viewModel.uiSideEffect.collect {
+            when (it) {
+                PrivacyDisclaimerUiSideEffect.NavigateToLogin -> {
+                    (context as MainActivity).initializeStateHandlerAndServiceConnection()
+                    navigator.navigate(LoginDestination(null)) {
+                        launchSingleTop = true
+                        popUpTo(NavGraphs.root) { inclusive = true }
+                    }
+                }
+            }
+        }
+    }
+    PrivacyDisclaimerScreen({}, viewModel::setPrivacyDisclosureAccepted)
+}
+
 @Composable
 fun PrivacyDisclaimerScreen(
     onPrivacyPolicyLinkClicked: () -> Unit,
     onAcceptClicked: () -> Unit,
 ) {
     val topColor = MaterialTheme.colorScheme.primary
-    ScaffoldWithTopBar(
-        topBarColor = topColor,
-        statusBarColor = topColor,
-        navigationBarColor = MaterialTheme.colorScheme.background,
-        onAccountClicked = null,
-        onSettingsClicked = null
-    ) {
+    ScaffoldWithTopBar(topBarColor = topColor, onAccountClicked = null, onSettingsClicked = null) {
         ConstraintLayout(
             modifier =
-                Modifier.fillMaxHeight()
-                    .fillMaxWidth()
-                    .padding(it)
+                Modifier.padding(it)
+                    .fillMaxSize()
                     .background(color = MaterialTheme.colorScheme.background)
         ) {
             val (body, actionButtons) = createRefs()
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogScreen.kt
deleted file mode 100644
index 1db18b01a31b..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogScreen.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package net.mullvad.mullvadvpn.compose.screen
-
-import android.content.res.Configuration
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.tooling.preview.Devices
-import androidx.compose.ui.tooling.preview.Preview
-import net.mullvad.mullvadvpn.compose.dialog.RedeemVoucherDialog
-import net.mullvad.mullvadvpn.compose.state.VoucherDialogUiState
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES, device = Devices.PIXEL_3)
-@Composable
-private fun PreviewRedeemVoucherDialogScreen() {
-    AppTheme {
-        RedeemVoucherDialogScreen(
-            uiState = VoucherDialogUiState.INITIAL,
-            onVoucherInputChange = {},
-            onRedeem = {},
-            onDismiss = {}
-        )
-    }
-}
-
-@Composable
-internal fun RedeemVoucherDialogScreen(
-    uiState: VoucherDialogUiState,
-    onVoucherInputChange: (String) -> Unit = {},
-    onRedeem: (voucherCode: String) -> Unit,
-    onDismiss: (isTimeAdded: Boolean) -> Unit
-) {
-    RedeemVoucherDialog(uiState, onVoucherInputChange, onRedeem, onDismiss)
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
index 0621c7ebcd37..611c493868d9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ReportProblemScreen.kt
@@ -14,6 +14,9 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -25,20 +28,29 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.result.NavResult
+import com.ramcosta.composedestinations.result.ResultRecipient
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.button.PrimaryButton
 import net.mullvad.mullvadvpn.compose.button.VariantButton
 import net.mullvad.mullvadvpn.compose.component.MullvadCircularProgressIndicatorLarge
 import net.mullvad.mullvadvpn.compose.component.NavigateBackIconButton
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithMediumTopBar
-import net.mullvad.mullvadvpn.compose.dialog.ReportProblemNoEmailDialog
+import net.mullvad.mullvadvpn.compose.destinations.ReportProblemNoEmailDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.ViewLogsDestination
 import net.mullvad.mullvadvpn.compose.textfield.mullvadWhiteTextFieldColors
+import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
 import net.mullvad.mullvadvpn.compose.util.SecureScreenWhileInView
 import net.mullvad.mullvadvpn.dataproxy.SendProblemReportResult
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
+import net.mullvad.mullvadvpn.viewmodel.ReportProblemSideEffect
 import net.mullvad.mullvadvpn.viewmodel.ReportProblemUiState
+import net.mullvad.mullvadvpn.viewmodel.ReportProblemViewModel
 import net.mullvad.mullvadvpn.viewmodel.SendingReportUiState
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
@@ -50,22 +62,19 @@ private fun PreviewReportProblemScreen() {
 @Composable
 private fun PreviewReportProblemSendingScreen() {
     AppTheme {
-        ReportProblemScreen(uiState = ReportProblemUiState(false, SendingReportUiState.Sending))
+        ReportProblemScreen(
+            uiState = ReportProblemUiState(sendingState = SendingReportUiState.Sending),
+        )
     }
 }
 
-@Preview
-@Composable
-private fun PreviewReportProblemConfirmNoEmailScreen() {
-    AppTheme { ReportProblemScreen(uiState = ReportProblemUiState(true)) }
-}
-
 @Preview
 @Composable
 private fun PreviewReportProblemSuccessScreen() {
     AppTheme {
         ReportProblemScreen(
-            uiState = ReportProblemUiState(false, SendingReportUiState.Success("email@mail.com"))
+            uiState =
+                ReportProblemUiState(sendingState = SendingReportUiState.Success("email@mail.com")),
         )
     }
 }
@@ -77,37 +86,67 @@ private fun PreviewReportProblemErrorScreen() {
         ReportProblemScreen(
             uiState =
                 ReportProblemUiState(
-                    false,
-                    SendingReportUiState.Error(SendProblemReportResult.Error.CollectLog)
+                    sendingState =
+                        SendingReportUiState.Error(SendProblemReportResult.Error.CollectLog)
                 )
         )
     }
 }
 
+@Destination(style = SlideInFromRightTransition::class)
+@Composable
+fun ReportProblem(
+    navigator: DestinationsNavigator,
+    resultRecipient: ResultRecipient<ReportProblemNoEmailDialogDestination, Boolean>
+) {
+    val vm = koinViewModel<ReportProblemViewModel>()
+    val uiState by vm.uiState.collectAsState()
+
+    LaunchedEffect(Unit) {
+        vm.uiSideEffect.collect {
+            when (it) {
+                is ReportProblemSideEffect.ShowConfirmNoEmail -> {
+                    navigator.navigate(ReportProblemNoEmailDialogDestination())
+                }
+            }
+        }
+    }
+
+    resultRecipient.onNavResult {
+        when (it) {
+            NavResult.Canceled -> {}
+            is NavResult.Value -> vm.sendReport(uiState.email, uiState.description, true)
+        }
+    }
+
+    ReportProblemScreen(
+        uiState,
+        onSendReport = { vm.sendReport(uiState.email, uiState.description) },
+        onClearSendResult = vm::clearSendResult,
+        onNavigateToViewLogs = {
+            navigator.navigate(ViewLogsDestination()) { launchSingleTop = true }
+        },
+        onEmailChanged = vm::updateEmail,
+        onDescriptionChanged = vm::updateDescription,
+        onBackClick = navigator::navigateUp,
+    )
+}
+
 @Composable
-fun ReportProblemScreen(
+private fun ReportProblemScreen(
     uiState: ReportProblemUiState,
-    onSendReport: (String, String) -> Unit = { _, _ -> },
-    onDismissNoEmailDialog: () -> Unit = {},
+    onSendReport: () -> Unit = {},
     onClearSendResult: () -> Unit = {},
     onNavigateToViewLogs: () -> Unit = {},
-    updateEmail: (String) -> Unit = {},
-    updateDescription: (String) -> Unit = {},
+    onEmailChanged: (String) -> Unit = {},
+    onDescriptionChanged: (String) -> Unit = {},
     onBackClick: () -> Unit = {}
 ) {
-    // Dialog to show confirm if no email was added
-    if (uiState.showConfirmNoEmail) {
-        ReportProblemNoEmailDialog(
-            onDismiss = onDismissNoEmailDialog,
-            onConfirm = { onSendReport(uiState.email, uiState.description) }
-        )
-    }
 
     ScaffoldWithMediumTopBar(
         appBarTitle = stringResource(id = R.string.report_a_problem),
         navigationIcon = { NavigateBackIconButton(onBackClick) }
     ) { modifier ->
-
         // Show sending states
         if (uiState.sendingState != null) {
             Column(
@@ -119,11 +158,7 @@ fun ReportProblemScreen(
             ) {
                 when (uiState.sendingState) {
                     SendingReportUiState.Sending -> SendingContent()
-                    is SendingReportUiState.Error ->
-                        ErrorContent(
-                            { onSendReport(uiState.email, uiState.description) },
-                            onClearSendResult
-                        )
+                    is SendingReportUiState.Error -> ErrorContent(onSendReport, onClearSendResult)
                     is SendingReportUiState.Success -> SentContent(uiState.sendingState)
                 }
                 return@ScaffoldWithMediumTopBar
@@ -146,7 +181,7 @@ fun ReportProblemScreen(
             TextField(
                 modifier = Modifier.fillMaxWidth(),
                 value = uiState.email,
-                onValueChange = updateEmail,
+                onValueChange = onEmailChanged,
                 maxLines = 1,
                 singleLine = true,
                 placeholder = { Text(text = stringResource(id = R.string.user_email_hint)) },
@@ -156,7 +191,7 @@ fun ReportProblemScreen(
             TextField(
                 modifier = Modifier.fillMaxWidth().weight(1f),
                 value = uiState.description,
-                onValueChange = updateDescription,
+                onValueChange = onDescriptionChanged,
                 placeholder = { Text(stringResource(R.string.user_message_hint)) },
                 colors = mullvadWhiteTextFieldColors()
             )
@@ -168,7 +203,7 @@ fun ReportProblemScreen(
                 )
                 Spacer(modifier = Modifier.height(Dimens.buttonSpacing))
                 VariantButton(
-                    onClick = { onSendReport(uiState.email, uiState.description) },
+                    onClick = onSendReport,
                     isEnabled = uiState.description.isNotEmpty(),
                     text = stringResource(id = R.string.send)
                 )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
index c09a0b986a61..7e780a035189 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt
@@ -16,9 +16,11 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -36,7 +38,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.sp
 import androidx.core.text.HtmlCompat
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import net.mullvad.mullvadvpn.R
@@ -49,11 +52,14 @@ import net.mullvad.mullvadvpn.compose.extensions.toAnnotatedString
 import net.mullvad.mullvadvpn.compose.state.SelectLocationUiState
 import net.mullvad.mullvadvpn.compose.test.CIRCULAR_PROGRESS_INDICATOR
 import net.mullvad.mullvadvpn.compose.textfield.SearchTextField
+import net.mullvad.mullvadvpn.compose.transitions.SlideInFromBottomTransition
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar
 import net.mullvad.mullvadvpn.relaylist.RelayCountry
 import net.mullvad.mullvadvpn.relaylist.RelayItem
+import net.mullvad.mullvadvpn.viewmodel.SelectLocationViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
@@ -67,135 +73,148 @@ private fun PreviewSelectLocationScreen() {
         SelectLocationScreen(
             uiState = state,
             uiCloseAction = MutableSharedFlow(),
-            enterTransitionEndAction = MutableSharedFlow()
         )
     }
 }
 
+@Destination(style = SlideInFromBottomTransition::class)
+@Composable
+fun SelectLocation(navigator: DestinationsNavigator) {
+    val vm = koinViewModel<SelectLocationViewModel>()
+    val state = vm.uiState.collectAsState().value
+    SelectLocationScreen(
+        uiState = state,
+        uiCloseAction = vm.uiCloseAction,
+        onSelectRelay = vm::selectRelay,
+        onSearchTermInput = vm::onSearchTermInput,
+        onBackClick = navigator::navigateUp,
+    )
+}
+
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun SelectLocationScreen(
     uiState: SelectLocationUiState,
     uiCloseAction: SharedFlow<Unit>,
-    enterTransitionEndAction: SharedFlow<Unit>,
     onSelectRelay: (item: RelayItem) -> Unit = {},
     onSearchTermInput: (searchTerm: String) -> Unit = {},
     onBackClick: () -> Unit = {}
 ) {
     val backgroundColor = MaterialTheme.colorScheme.background
-    val systemUiController = rememberSystemUiController()
 
     LaunchedEffect(Unit) { uiCloseAction.collect { onBackClick() } }
-    LaunchedEffect(Unit) {
-        enterTransitionEndAction.collect { systemUiController.setStatusBarColor(backgroundColor) }
-    }
 
     val (backFocus, listFocus, searchBarFocus) = remember { FocusRequester.createRefs() }
-    Column(modifier = Modifier.background(backgroundColor).fillMaxWidth().fillMaxHeight()) {
-        Row(
+    Scaffold {
+        Column(
             modifier =
-                Modifier.padding(
-                        horizontal = Dimens.selectLocationTitlePadding,
-                        vertical = Dimens.selectLocationTitlePadding
-                    )
-                    .fillMaxWidth()
+                Modifier.padding(it).background(backgroundColor).fillMaxWidth().fillMaxHeight()
         ) {
-            Image(
-                painter = painterResource(id = R.drawable.icon_back),
-                contentDescription = null,
-                modifier =
-                    Modifier.focusRequester(backFocus)
-                        .focusProperties { next = listFocus }
-                        .focusProperties {
-                            down = listFocus
-                            right = searchBarFocus
-                        }
-                        .size(Dimens.titleIconSize)
-                        .rotate(270f)
-                        .clickable { onBackClick() }
-            )
-            Text(
-                text = stringResource(id = R.string.select_location),
+            Row(
                 modifier =
-                    Modifier.align(Alignment.CenterVertically)
-                        .weight(weight = 1f)
-                        .padding(end = Dimens.titleIconSize),
-                textAlign = TextAlign.Center,
-                style = MaterialTheme.typography.headlineSmall.copy(fontSize = 20.sp),
-                color = MaterialTheme.colorScheme.onPrimary
-            )
-        }
-        SearchTextField(
-            modifier =
-                Modifier.fillMaxWidth()
-                    .focusRequester(searchBarFocus)
-                    .focusProperties { next = backFocus }
-                    .height(Dimens.searchFieldHeight)
-                    .padding(horizontal = Dimens.searchFieldHorizontalPadding)
-        ) { searchString ->
-            onSearchTermInput.invoke(searchString)
-        }
-        Spacer(modifier = Modifier.height(height = Dimens.verticalSpace))
-        val lazyListState = rememberLazyListState()
-        LazyColumn(
-            modifier =
-                Modifier.focusRequester(listFocus)
-                    .fillMaxSize()
-                    .drawVerticalScrollbar(
-                        lazyListState,
-                        MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaScrollbar)
-                    ),
-            state = lazyListState,
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            when (uiState) {
-                SelectLocationUiState.Loading -> {
-                    item(contentType = ContentType.PROGRESS) {
-                        MullvadCircularProgressIndicatorLarge(
-                            Modifier.testTag(CIRCULAR_PROGRESS_INDICATOR)
+                    Modifier.padding(
+                            horizontal = Dimens.selectLocationTitlePadding,
+                            vertical = Dimens.selectLocationTitlePadding
                         )
+                        .fillMaxWidth()
+            ) {
+                Image(
+                    painter = painterResource(id = R.drawable.icon_back),
+                    contentDescription = null,
+                    modifier =
+                        Modifier.focusRequester(backFocus)
+                            .focusProperties { next = listFocus }
+                            .focusProperties {
+                                down = listFocus
+                                right = searchBarFocus
+                            }
+                            .size(Dimens.titleIconSize)
+                            .rotate(270f)
+                            .clickable { onBackClick() }
+                )
+                Text(
+                    text = stringResource(id = R.string.select_location),
+                    modifier =
+                        Modifier.align(Alignment.CenterVertically)
+                            .weight(weight = 1f)
+                            .padding(end = Dimens.titleIconSize),
+                    textAlign = TextAlign.Center,
+                    style = MaterialTheme.typography.headlineSmall.copy(fontSize = 20.sp),
+                    color = MaterialTheme.colorScheme.onPrimary
+                )
+            }
+            SearchTextField(
+                modifier =
+                    Modifier.fillMaxWidth()
+                        .focusRequester(searchBarFocus)
+                        .focusProperties { next = backFocus }
+                        .height(Dimens.searchFieldHeight)
+                        .padding(horizontal = Dimens.searchFieldHorizontalPadding)
+            ) { searchString ->
+                onSearchTermInput.invoke(searchString)
+            }
+            Spacer(modifier = Modifier.height(height = Dimens.verticalSpace))
+            val lazyListState = rememberLazyListState()
+            LazyColumn(
+                modifier =
+                    Modifier.focusRequester(listFocus)
+                        .fillMaxSize()
+                        .drawVerticalScrollbar(
+                            lazyListState,
+                            MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaScrollbar)
+                        ),
+                state = lazyListState,
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                when (uiState) {
+                    SelectLocationUiState.Loading -> {
+                        item(contentType = ContentType.PROGRESS) {
+                            MullvadCircularProgressIndicatorLarge(
+                                Modifier.testTag(CIRCULAR_PROGRESS_INDICATOR)
+                            )
+                        }
                     }
-                }
-                is SelectLocationUiState.ShowData -> {
-                    items(
-                        count = uiState.countries.size,
-                        key = { index -> uiState.countries[index].hashCode() },
-                        contentType = { ContentType.ITEM }
-                    ) { index ->
-                        val country = uiState.countries[index]
-                        RelayLocationCell(
-                            relay = country,
-                            selectedItem = uiState.selectedRelay,
-                            onSelectRelay = onSelectRelay,
-                            modifier = Modifier.animateContentSize()
-                        )
+                    is SelectLocationUiState.ShowData -> {
+                        items(
+                            count = uiState.countries.size,
+                            key = { index -> uiState.countries[index].hashCode() },
+                            contentType = { ContentType.ITEM }
+                        ) { index ->
+                            val country = uiState.countries[index]
+                            RelayLocationCell(
+                                relay = country,
+                                selectedItem = uiState.selectedRelay,
+                                onSelectRelay = onSelectRelay,
+                                modifier = Modifier.animateContentSize()
+                            )
+                        }
                     }
-                }
-                is SelectLocationUiState.NoSearchResultFound -> {
-                    item(contentType = ContentType.EMPTY_TEXT) {
-                        val firstRow =
-                            HtmlCompat.fromHtml(
-                                    textResource(
-                                        id = R.string.select_location_empty_text_first_row,
-                                        uiState.searchTerm
-                                    ),
-                                    HtmlCompat.FROM_HTML_MODE_COMPACT
-                                )
-                                .toAnnotatedString(boldFontWeight = FontWeight.ExtraBold)
-                        Text(
-                            text =
-                                buildAnnotatedString {
-                                    append(firstRow)
-                                    appendLine()
-                                    append(
+                    is SelectLocationUiState.NoSearchResultFound -> {
+                        item(contentType = ContentType.EMPTY_TEXT) {
+                            val firstRow =
+                                HtmlCompat.fromHtml(
                                         textResource(
-                                            id = R.string.select_location_empty_text_second_row
-                                        )
+                                            id = R.string.select_location_empty_text_first_row,
+                                            uiState.searchTerm
+                                        ),
+                                        HtmlCompat.FROM_HTML_MODE_COMPACT
                                     )
-                                },
-                            style = MaterialTheme.typography.labelMedium,
-                            textAlign = TextAlign.Center
-                        )
+                                    .toAnnotatedString(boldFontWeight = FontWeight.ExtraBold)
+                            Text(
+                                text =
+                                    buildAnnotatedString {
+                                        append(firstRow)
+                                        appendLine()
+                                        append(
+                                            textResource(
+                                                id = R.string.select_location_empty_text_second_row
+                                            )
+                                        )
+                                    },
+                                style = MaterialTheme.typography.labelMedium,
+                                textAlign = TextAlign.Center
+                            )
+                        }
                     }
                 }
             }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt
index b092ed981b5f..67590232b179 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt
@@ -11,29 +11,35 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.cell.DefaultExternalLinkView
 import net.mullvad.mullvadvpn.compose.cell.NavigationCellBody
 import net.mullvad.mullvadvpn.compose.cell.NavigationComposeCell
 import net.mullvad.mullvadvpn.compose.component.NavigateBackDownIconButton
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithMediumTopBar
+import net.mullvad.mullvadvpn.compose.destinations.ReportProblemDestination
+import net.mullvad.mullvadvpn.compose.destinations.SplitTunnelingDestination
+import net.mullvad.mullvadvpn.compose.destinations.VpnSettingsDestination
 import net.mullvad.mullvadvpn.compose.extensions.itemWithDivider
 import net.mullvad.mullvadvpn.compose.state.SettingsUiState
 import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_TEST_TAG
+import net.mullvad.mullvadvpn.compose.transitions.SettingsTransition
 import net.mullvad.mullvadvpn.constant.IS_PLAY_BUILD
 import net.mullvad.mullvadvpn.lib.common.util.openLink
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.util.appendHideNavOnPlayBuild
+import net.mullvad.mullvadvpn.viewmodel.SettingsViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Preview
@@ -47,29 +53,41 @@ private fun PreviewSettings() {
                     isLoggedIn = true,
                     isUpdateAvailable = true
                 ),
-            enterTransitionEndAction = MutableSharedFlow()
         )
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@Destination(style = SettingsTransition::class)
+@Composable
+fun Settings(navigator: DestinationsNavigator) {
+    val vm = koinViewModel<SettingsViewModel>()
+    val state by vm.uiState.collectAsState()
+    SettingsScreen(
+        uiState = state,
+        onVpnSettingCellClick = {
+            navigator.navigate(VpnSettingsDestination) { launchSingleTop = true }
+        },
+        onSplitTunnelingCellClick = {
+            navigator.navigate(SplitTunnelingDestination) { launchSingleTop = true }
+        },
+        onReportProblemCellClick = {
+            navigator.navigate(ReportProblemDestination) { launchSingleTop = true }
+        },
+        onBackClick = { navigator.navigateUp() }
+    )
+}
+
 @ExperimentalMaterial3Api
 @Composable
 fun SettingsScreen(
     uiState: SettingsUiState,
-    enterTransitionEndAction: SharedFlow<Unit>,
     onVpnSettingCellClick: () -> Unit = {},
     onSplitTunnelingCellClick: () -> Unit = {},
     onReportProblemCellClick: () -> Unit = {},
     onBackClick: () -> Unit = {}
 ) {
     val context = LocalContext.current
-    val backgroundColor = MaterialTheme.colorScheme.background
-    val systemUiController = rememberSystemUiController()
-
-    LaunchedEffect(Unit) {
-        systemUiController.setNavigationBarColor(backgroundColor)
-        enterTransitionEndAction.collect { systemUiController.setStatusBarColor(backgroundColor) }
-    }
 
     ScaffoldWithMediumTopBar(
         appBarTitle = stringResource(id = R.string.settings),
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoadingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplashScreen.kt
similarity index 54%
rename from android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoadingScreen.kt
rename to android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplashScreen.kt
index d27b4196aa21..d95cb00cc90d 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/LoadingScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplashScreen.kt
@@ -1,5 +1,6 @@
 package net.mullvad.mullvadvpn.compose.screen
 
+import android.window.SplashScreen
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -12,6 +13,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.compositeOver
@@ -20,26 +22,79 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.annotation.RootNavGraph
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.popUpTo
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.NavGraphs
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar
+import net.mullvad.mullvadvpn.compose.destinations.ConnectDestination
+import net.mullvad.mullvadvpn.compose.destinations.DeviceRevokedDestination
+import net.mullvad.mullvadvpn.compose.destinations.LoginDestination
+import net.mullvad.mullvadvpn.compose.destinations.OutOfTimeDestination
+import net.mullvad.mullvadvpn.compose.destinations.PrivacyDisclaimerDestination
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaDescription
+import net.mullvad.mullvadvpn.viewmodel.SplashUiSideEffect
+import net.mullvad.mullvadvpn.viewmodel.SplashViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
 private fun PreviewLoadingScreen() {
-    AppTheme { LoadingScreen() }
+    AppTheme { SplashScreen() }
 }
 
+// Set this as the start destination of the default nav graph
+@RootNavGraph(start = true)
+@Destination
 @Composable
-fun LoadingScreen(onSettingsCogClicked: () -> Unit = {}) {
+fun Splash(navigator: DestinationsNavigator) {
+    val viewModel: SplashViewModel = koinViewModel()
+
+    LaunchedEffect(Unit) {
+        viewModel.uiSideEffect.collect {
+            when (it) {
+                SplashUiSideEffect.NavigateToConnect -> {
+                    navigator.navigate(ConnectDestination) {
+                        popUpTo(NavGraphs.root) { inclusive = true }
+                    }
+                }
+                SplashUiSideEffect.NavigateToLogin -> {
+                    navigator.navigate(LoginDestination()) {
+                        popUpTo(NavGraphs.root) { inclusive = true }
+                    }
+                }
+                SplashUiSideEffect.NavigateToPrivacyDisclaimer -> {
+                    navigator.navigate(PrivacyDisclaimerDestination) { popUpTo(NavGraphs.root) {} }
+                }
+                SplashUiSideEffect.NavigateToRevoked -> {
+                    navigator.navigate(DeviceRevokedDestination) {
+                        popUpTo(NavGraphs.root) { inclusive = true }
+                    }
+                }
+                SplashUiSideEffect.NavigateToOutOfTime ->
+                    navigator.navigate(OutOfTimeDestination) {
+                        popUpTo(NavGraphs.root) { inclusive = true }
+                    }
+            }
+        }
+    }
+
+    LaunchedEffect(Unit) { viewModel.start() }
+
+    SplashScreen()
+}
+
+@Composable
+private fun SplashScreen() {
+
     val backgroundColor = MaterialTheme.colorScheme.primary
 
     ScaffoldWithTopBar(
         topBarColor = backgroundColor,
-        statusBarColor = backgroundColor,
-        navigationBarColor = backgroundColor,
-        onSettingsClicked = onSettingsCogClicked,
+        onSettingsClicked = {},
         onAccountClicked = null,
         isIconAndLogoVisible = false,
         content = {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
index a1f9bd8a97fd..339673949178 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
@@ -13,12 +13,19 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusDirection
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.core.graphics.drawable.toBitmapOrNull
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.applist.AppData
 import net.mullvad.mullvadvpn.compose.cell.BaseCell
@@ -32,8 +39,11 @@ import net.mullvad.mullvadvpn.compose.constant.ContentType
 import net.mullvad.mullvadvpn.compose.constant.SplitTunnelingContentKey
 import net.mullvad.mullvadvpn.compose.extensions.itemWithDivider
 import net.mullvad.mullvadvpn.compose.state.SplitTunnelingUiState
+import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
+import net.mullvad.mullvadvpn.viewmodel.SplitTunnelingViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
@@ -69,6 +79,25 @@ private fun PreviewSplitTunnelingScreen() {
     }
 }
 
+@Destination(style = SlideInFromRightTransition::class)
+@Composable
+fun SplitTunneling(navigator: DestinationsNavigator) {
+    val viewModel = koinViewModel<SplitTunnelingViewModel>()
+    val state by viewModel.uiState.collectAsState()
+    val context = LocalContext.current
+    val packageManager = remember(context) { context.packageManager }
+    SplitTunnelingScreen(
+        uiState = state,
+        onShowSystemAppsClick = viewModel::onShowSystemAppsClick,
+        onExcludeAppClick = viewModel::onExcludeAppClick,
+        onIncludeAppClick = viewModel::onIncludeAppClick,
+        onBackClick = navigator::navigateUp,
+        onResolveIcon = { packageName ->
+            packageManager.getApplicationIcon(packageName).toBitmapOrNull()
+        }
+    )
+}
+
 @Composable
 @OptIn(ExperimentalFoundationApi::class)
 fun SplitTunnelingScreen(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt
index cbe1f6d0b38a..7084ef5f5080 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ViewLogsScreen.kt
@@ -17,20 +17,26 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.component.MullvadCircularProgressIndicatorMedium
 import net.mullvad.mullvadvpn.compose.component.MullvadMediumTopBar
 import net.mullvad.mullvadvpn.compose.component.NavigateBackIconButton
 import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar
+import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar
 import net.mullvad.mullvadvpn.viewmodel.ViewLogsUiState
+import net.mullvad.mullvadvpn.viewmodel.ViewLogsViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
@@ -44,6 +50,14 @@ private fun PreviewViewLogsLoadingScreen() {
     AppTheme { ViewLogsScreen(uiState = ViewLogsUiState()) }
 }
 
+@Destination(style = SlideInFromRightTransition::class)
+@Composable
+fun ViewLogs(navigator: DestinationsNavigator) {
+    val vm = koinViewModel<ViewLogsViewModel>()
+    val uiState = vm.uiState.collectAsState()
+    ViewLogsScreen(uiState = uiState.value, onBackClick = navigator::navigateUp)
+}
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ViewLogsScreen(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
index 7290b9600fd3..72f3f516e9bb 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.compose.screen
 
-import android.widget.Toast
 import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -11,17 +10,19 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.Divider
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
@@ -30,10 +31,14 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.result.NavResult
+import com.ramcosta.composedestinations.result.ResultRecipient
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.cell.BaseCell
 import net.mullvad.mullvadvpn.compose.cell.ContentBlockersDisableModeCellSubtitle
@@ -50,18 +55,20 @@ import net.mullvad.mullvadvpn.compose.cell.SelectableCell
 import net.mullvad.mullvadvpn.compose.cell.SwitchComposeSubtitleCell
 import net.mullvad.mullvadvpn.compose.component.NavigateBackIconButton
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithMediumTopBar
-import net.mullvad.mullvadvpn.compose.dialog.ContentBlockersInfoDialog
-import net.mullvad.mullvadvpn.compose.dialog.CustomDnsInfoDialog
-import net.mullvad.mullvadvpn.compose.dialog.CustomPortDialog
-import net.mullvad.mullvadvpn.compose.dialog.DnsDialog
-import net.mullvad.mullvadvpn.compose.dialog.LocalNetworkSharingInfoDialog
-import net.mullvad.mullvadvpn.compose.dialog.MalwareInfoDialog
-import net.mullvad.mullvadvpn.compose.dialog.MtuDialog
-import net.mullvad.mullvadvpn.compose.dialog.ObfuscationInfoDialog
-import net.mullvad.mullvadvpn.compose.dialog.QuantumResistanceInfoDialog
-import net.mullvad.mullvadvpn.compose.dialog.WireguardPortInfoDialog
+import net.mullvad.mullvadvpn.compose.destinations.ContentBlockersInfoDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.CustomDnsInfoDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.DnsDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.LocalNetworkSharingInfoDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.MalwareInfoDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.MtuDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.ObfuscationInfoDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.QuantumResistanceInfoDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.UdpOverTcpPortInfoDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.WireguardCustomPortDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.WireguardPortInfoDialogDestination
+import net.mullvad.mullvadvpn.compose.dialog.WireguardCustomPortNavArgs
+import net.mullvad.mullvadvpn.compose.dialog.WireguardPortInfoDialogArgument
 import net.mullvad.mullvadvpn.compose.extensions.itemWithDivider
-import net.mullvad.mullvadvpn.compose.state.VpnSettingsDialog
 import net.mullvad.mullvadvpn.compose.state.VpnSettingsUiState
 import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_LAST_ITEM_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_QUANTUM_ITEM_OFF_TEST_TAG
@@ -70,17 +77,22 @@ import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_WIREGUARD_CUSTOM_PORT_NUMBER_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_WIREGUARD_CUSTOM_PORT_TEXT_TEST_TAG
 import net.mullvad.mullvadvpn.compose.test.LAZY_LIST_WIREGUARD_PORT_ITEM_X_TEST_TAG
+import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
 import net.mullvad.mullvadvpn.constant.WIREGUARD_PRESET_PORTS
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.model.Constraint
 import net.mullvad.mullvadvpn.model.Port
+import net.mullvad.mullvadvpn.model.PortRange
 import net.mullvad.mullvadvpn.model.QuantumResistantState
 import net.mullvad.mullvadvpn.model.SelectedObfuscation
 import net.mullvad.mullvadvpn.util.hasValue
 import net.mullvad.mullvadvpn.util.isCustom
-import net.mullvad.mullvadvpn.util.toDisplayCustomPort
+import net.mullvad.mullvadvpn.util.toValueOrNull
 import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
+import net.mullvad.mullvadvpn.viewmodel.VpnSettingsSideEffect
+import net.mullvad.mullvadvpn.viewmodel.VpnSettingsViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
@@ -94,167 +106,195 @@ private fun PreviewVpnSettings() {
                     isCustomDnsEnabled = true,
                     customDnsItems = listOf(CustomDnsItem("0.0.0.0", false)),
                 ),
-            onMtuCellClick = {},
-            onSaveMtuClick = {},
-            onRestoreMtuClick = {},
-            onCancelMtuDialogClick = {},
-            onToggleAutoConnect = {},
-            onToggleLocalNetworkSharing = {},
-            onToggleDnsClick = {},
-            onToggleBlockAds = {},
+            sideEffect = MutableSharedFlow<VpnSettingsSideEffect>().asSharedFlow(),
             onToggleBlockTrackers = {},
+            onToggleBlockAds = {},
             onToggleBlockMalware = {},
+            onToggleAutoConnect = {},
+            onToggleLocalNetworkSharing = {},
             onToggleBlockAdultContent = {},
             onToggleBlockGambling = {},
             onToggleBlockSocialMedia = {},
-            onDnsClick = {},
-            onDnsInputChange = {},
-            onSaveDnsClick = {},
-            onRemoveDnsClick = {},
-            onCancelDnsDialogClick = {},
-            onLocalNetworkSharingInfoClick = {},
-            onContentsBlockersInfoClick = {},
-            onMalwareInfoClick = {},
-            onCustomDnsInfoClick = {},
-            onDismissInfoClick = {},
+            navigateToMtuDialog = {},
+            navigateToDns = { _, _ -> },
+            onToggleDnsClick = {},
             onBackClick = {},
-            toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow(),
             onStopEvent = {},
             onSelectObfuscationSetting = {},
-            onObfuscationInfoClick = {},
             onSelectQuantumResistanceSetting = {},
-            onQuantumResistanceInfoClicked = {},
             onWireguardPortSelected = {},
-            onWireguardPortInfoClicked = {},
-            onShowCustomPortDialog = {},
-            onCancelCustomPortDialogClick = {},
-            onCloseCustomPortDialog = {}
         )
     }
 }
 
+@Destination(style = SlideInFromRightTransition::class)
+@Composable
+fun VpnSettings(
+    navigator: DestinationsNavigator,
+    dnsDialogResult: ResultRecipient<DnsDialogDestination, Boolean>,
+    customWgPortResult: ResultRecipient<WireguardCustomPortDialogDestination, Int?>
+) {
+    val vm = koinViewModel<VpnSettingsViewModel>()
+    val state = vm.uiState.collectAsState().value
+
+    dnsDialogResult.onNavResult {
+        when (it) {
+            NavResult.Canceled -> {
+                vm.onDnsDialogDismiss()
+            }
+            is NavResult.Value -> {}
+        }
+    }
+
+    customWgPortResult.onNavResult {
+        when (it) {
+            NavResult.Canceled -> {}
+            is NavResult.Value -> {
+                val port = it.value
+
+                if (port != null) {
+                    vm.onWireguardPortSelected(Constraint.Only(Port(port)))
+                } else {
+                    vm.resetCustomPort()
+                }
+            }
+        }
+    }
+
+    VpnSettingsScreen(
+        uiState = state,
+        sideEffect = vm.uiSideEffect,
+        navigateToContentBlockersInfo = {
+            navigator.navigate(ContentBlockersInfoDialogDestination) { launchSingleTop = true }
+        },
+        navigateToCustomDnsInfo = {
+            navigator.navigate(CustomDnsInfoDialogDestination) { launchSingleTop = true }
+        },
+        navigateToMalwareInfo = {
+            navigator.navigate(MalwareInfoDialogDestination) { launchSingleTop = true }
+        },
+        navigateToObfuscationInfo = {
+            navigator.navigate(ObfuscationInfoDialogDestination) { launchSingleTop = true }
+        },
+        navigateToQuantumResistanceInfo = {
+            navigator.navigate(QuantumResistanceInfoDialogDestination) { launchSingleTop = true }
+        },
+        navigateUdp2TcpInfo = {
+            navigator.navigate(UdpOverTcpPortInfoDialogDestination) { launchSingleTop = true }
+        },
+        navigateToWireguardPortInfo = {
+            navigator.navigate(
+                WireguardPortInfoDialogDestination(WireguardPortInfoDialogArgument(it))
+            ) {
+                launchSingleTop = true
+            }
+        },
+        navigateToLocalNetworkSharingInfo = {
+            navigator.navigate(LocalNetworkSharingInfoDialogDestination) { launchSingleTop = true }
+        },
+        onToggleBlockTrackers = vm::onToggleBlockTrackers,
+        onToggleBlockAds = vm::onToggleBlockAds,
+        onToggleBlockMalware = vm::onToggleBlockMalware,
+        onToggleAutoConnect = vm::onToggleAutoConnect,
+        onToggleLocalNetworkSharing = vm::onToggleLocalNetworkSharing,
+        onToggleBlockAdultContent = vm::onToggleBlockAdultContent,
+        onToggleBlockGambling = vm::onToggleBlockGambling,
+        onToggleBlockSocialMedia = vm::onToggleBlockSocialMedia,
+        navigateToMtuDialog = {
+            navigator.navigate(MtuDialogDestination(it)) { launchSingleTop = true }
+        },
+        navigateToDns = { index, address ->
+            navigator.navigate(DnsDialogDestination(index, address)) { launchSingleTop = true }
+        },
+        navigateToWireguardPortDialog = {
+            val args =
+                WireguardCustomPortNavArgs(
+                    state.customWireguardPort?.toValueOrNull(),
+                    state.availablePortRanges
+                )
+            navigator.navigate(WireguardCustomPortDialogDestination(args)) {
+                launchSingleTop = true
+            }
+        },
+        onToggleDnsClick = vm::onToggleDnsClick,
+        onBackClick = navigator::navigateUp,
+        onStopEvent = vm::onStopEvent,
+        onSelectObfuscationSetting = vm::onSelectObfuscationSetting,
+        onSelectQuantumResistanceSetting = vm::onSelectQuantumResistanceSetting,
+        onWireguardPortSelected = vm::onWireguardPortSelected,
+    )
+}
+
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun VpnSettingsScreen(
     lifecycleOwner: LifecycleOwner = LocalLifecycleOwner.current,
     uiState: VpnSettingsUiState,
-    onMtuCellClick: () -> Unit = {},
-    onSaveMtuClick: (Int) -> Unit = {},
-    onRestoreMtuClick: () -> Unit = {},
-    onCancelMtuDialogClick: () -> Unit = {},
-    onToggleAutoConnect: (Boolean) -> Unit = {},
-    onToggleLocalNetworkSharing: (Boolean) -> Unit = {},
-    onToggleDnsClick: (Boolean) -> Unit = {},
-    onToggleBlockAds: (Boolean) -> Unit = {},
+    sideEffect: SharedFlow<VpnSettingsSideEffect>,
+    navigateToContentBlockersInfo: () -> Unit = {},
+    navigateToCustomDnsInfo: () -> Unit = {},
+    navigateToMalwareInfo: () -> Unit = {},
+    navigateToObfuscationInfo: () -> Unit = {},
+    navigateToQuantumResistanceInfo: () -> Unit = {},
+    navigateUdp2TcpInfo: () -> Unit = {},
+    navigateToWireguardPortInfo: (availablePortRanges: List<PortRange>) -> Unit = {},
+    navigateToLocalNetworkSharingInfo: () -> Unit = {},
+    navigateToWireguardPortDialog: () -> Unit = {},
     onToggleBlockTrackers: (Boolean) -> Unit = {},
+    onToggleBlockAds: (Boolean) -> Unit = {},
     onToggleBlockMalware: (Boolean) -> Unit = {},
+    onToggleAutoConnect: (Boolean) -> Unit = {},
+    onToggleLocalNetworkSharing: (Boolean) -> Unit = {},
     onToggleBlockAdultContent: (Boolean) -> Unit = {},
     onToggleBlockGambling: (Boolean) -> Unit = {},
     onToggleBlockSocialMedia: (Boolean) -> Unit = {},
-    onDnsClick: (index: Int?) -> Unit = {},
-    onDnsInputChange: (String) -> Unit = {},
-    onSaveDnsClick: () -> Unit = {},
-    onRemoveDnsClick: () -> Unit = {},
-    onCancelDnsDialogClick: () -> Unit = {},
-    onLocalNetworkSharingInfoClick: () -> Unit = {},
-    onContentsBlockersInfoClick: () -> Unit = {},
-    onMalwareInfoClick: () -> Unit = {},
-    onCustomDnsInfoClick: () -> Unit = {},
-    onDismissInfoClick: () -> Unit = {},
+    navigateToMtuDialog: (mtu: Int?) -> Unit = {},
+    navigateToDns: (index: Int?, address: String?) -> Unit = { _, _ -> },
+    onToggleDnsClick: (Boolean) -> Unit = {},
     onBackClick: () -> Unit = {},
     onStopEvent: () -> Unit = {},
-    toastMessagesSharedFlow: SharedFlow<String>,
     onSelectObfuscationSetting: (selectedObfuscation: SelectedObfuscation) -> Unit = {},
-    onObfuscationInfoClick: () -> Unit = {},
     onSelectQuantumResistanceSetting: (quantumResistant: QuantumResistantState) -> Unit = {},
-    onQuantumResistanceInfoClicked: () -> Unit = {},
     onWireguardPortSelected: (port: Constraint<Port>) -> Unit = {},
-    onWireguardPortInfoClicked: () -> Unit = {},
-    onShowCustomPortDialog: () -> Unit = {},
-    onCancelCustomPortDialogClick: () -> Unit = {},
-    onCloseCustomPortDialog: () -> Unit = {}
 ) {
-    val savedCustomPort = rememberSaveable { mutableStateOf<Constraint<Port>>(Constraint.Any()) }
-
-    when (val dialog = uiState.dialog) {
-        is VpnSettingsDialog.Mtu -> {
-            MtuDialog(
-                mtuInitial = dialog.mtuEditValue.toIntOrNull(),
-                onSave = { onSaveMtuClick(it) },
-                onRestoreDefaultValue = { onRestoreMtuClick() },
-                onDismiss = { onCancelMtuDialogClick() }
-            )
-        }
-        is VpnSettingsDialog.Dns -> {
-            DnsDialog(
-                stagedDns = dialog.stagedDns,
-                isAllowLanEnabled = uiState.isAllowLanEnabled,
-                onIpAddressChanged = { onDnsInputChange(it) },
-                onAttemptToSave = { onSaveDnsClick() },
-                onRemove = { onRemoveDnsClick() },
-                onDismiss = { onCancelDnsDialogClick() }
-            )
-        }
-        is VpnSettingsDialog.LocalNetworkSharingInfo -> {
-            LocalNetworkSharingInfoDialog(onDismissInfoClick)
-        }
-        is VpnSettingsDialog.ContentBlockersInfo -> {
-            ContentBlockersInfoDialog(onDismissInfoClick)
-        }
-        is VpnSettingsDialog.CustomDnsInfo -> {
-            CustomDnsInfoDialog(onDismissInfoClick)
-        }
-        is VpnSettingsDialog.MalwareInfo -> {
-            MalwareInfoDialog(onDismissInfoClick)
-        }
-        is VpnSettingsDialog.ObfuscationInfo -> {
-            ObfuscationInfoDialog(onDismissInfoClick)
-        }
-        is VpnSettingsDialog.QuantumResistanceInfo -> {
-            QuantumResistanceInfoDialog(onDismissInfoClick)
-        }
-        is VpnSettingsDialog.WireguardPortInfo -> {
-            WireguardPortInfoDialog(dialog.availablePortRanges, onDismissInfoClick)
-        }
-        is VpnSettingsDialog.CustomPort -> {
-            CustomPortDialog(
-                customPort = savedCustomPort.value.toDisplayCustomPort(),
-                allowedPortRanges = dialog.availablePortRanges,
-                onSave = { customPortString ->
-                    onWireguardPortSelected(Constraint.Only(Port(customPortString.toInt())))
-                },
-                onReset = {
-                    if (uiState.selectedWireguardPort.isCustom()) {
-                        onWireguardPortSelected(Constraint.Any())
+    val snackbarHostState = remember { SnackbarHostState() }
+    LaunchedEffect(Unit) {
+        sideEffect.collect {
+            when (it) {
+                is VpnSettingsSideEffect.ShowToast ->
+                    launch {
+                        snackbarHostState.currentSnackbarData?.dismiss()
+                        snackbarHostState.showSnackbar(message = it.message)
                     }
-                    savedCustomPort.value = Constraint.Any()
-                    onCloseCustomPortDialog()
-                },
-                showReset = savedCustomPort.value is Constraint.Only,
-                onDismissRequest = { onCancelCustomPortDialogClick() }
-            )
+                VpnSettingsSideEffect.NavigateToDnsDialog -> navigateToDns(null, null)
+            }
         }
     }
 
+    //    when (val dialog = uiState.dialog) {
+    //        is VpnSettingsDialog.CustomPort -> {
+    //            CustomPortDialog(
+    //                customPort = savedCustomPort.value.toDisplayCustomPort(),
+    //                allowedPortRanges = dialog.availablePortRanges,
+    //                onSave = { customPortString ->
+    //                    onWireguardPortSelected(Constraint.Only(Port(customPortString.toInt())))
+    //                },
+    //                onReset = {
+    //                    if (uiState.selectedWireguardPort.isCustom()) {
+    //                        onWireguardPortSelected(Constraint.Any())
+    //                    }
+    //                    savedCustomPort.value = Constraint.Any()
+    //                    onCloseCustomPortDialog()
+    //                },
+    //                showReset = savedCustomPort.value is Constraint.Only,
+    //            )
+    //        }
+    //    }
+
     var expandContentBlockersState by rememberSaveable { mutableStateOf(false) }
     val biggerPadding = 54.dp
     val topPadding = 6.dp
 
-    LaunchedEffect(uiState.selectedWireguardPort) {
-        if (
-            uiState.selectedWireguardPort.isCustom() &&
-                uiState.selectedWireguardPort != savedCustomPort.value
-        ) {
-            savedCustomPort.value = uiState.selectedWireguardPort
-        }
-    }
-
-    val context = LocalContext.current
-    LaunchedEffect(Unit) {
-        toastMessagesSharedFlow.distinctUntilChanged().collect { message ->
-            Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
-        }
-    }
     DisposableEffect(lifecycleOwner) {
         val observer = LifecycleEventObserver { _, event ->
             if (event == Lifecycle.Event.ON_STOP) {
@@ -267,6 +307,7 @@ fun VpnSettingsScreen(
     ScaffoldWithMediumTopBar(
         appBarTitle = stringResource(id = R.string.settings_vpn),
         navigationIcon = { NavigateBackIconButton(onBackClick) },
+        snackbarHostState = snackbarHostState
     ) { modifier, lazyListState ->
         LazyColumn(
             modifier = modifier.testTag(LAZY_LIST_TEST_TAG).animateContentSize(),
@@ -288,10 +329,10 @@ fun VpnSettingsScreen(
                 Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding))
                 HeaderSwitchComposeCell(
                     title = stringResource(R.string.local_network_sharing),
-                    isToggled = uiState.isAllowLanEnabled,
+                    isToggled = uiState.isLocalNetworkSharingEnabled,
                     isEnabled = true,
                     onCellClicked = { newValue -> onToggleLocalNetworkSharing(newValue) },
-                    onInfoClicked = { onLocalNetworkSharingInfoClick() }
+                    onInfoClicked = navigateToLocalNetworkSharingInfo
                 )
                 Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding))
             }
@@ -301,7 +342,7 @@ fun VpnSettingsScreen(
                     title = stringResource(R.string.dns_content_blockers_title),
                     isExpanded = expandContentBlockersState,
                     isEnabled = !uiState.isCustomDnsEnabled,
-                    onInfoClicked = { onContentsBlockersInfoClick() },
+                    onInfoClicked = { navigateToContentBlockersInfo() },
                     onCellClicked = { expandContentBlockersState = !expandContentBlockersState }
                 )
             }
@@ -333,7 +374,7 @@ fun VpnSettingsScreen(
                         isToggled = uiState.contentBlockersOptions.blockMalware,
                         isEnabled = !uiState.isCustomDnsEnabled,
                         onCellClicked = { onToggleBlockMalware(it) },
-                        onInfoClicked = { onMalwareInfoClick() },
+                        onInfoClicked = { navigateToMalwareInfo() },
                         background = MaterialTheme.colorScheme.secondaryContainer,
                         startPadding = Dimens.indentedCellStartPadding
                     )
@@ -391,7 +432,7 @@ fun VpnSettingsScreen(
                     isToggled = uiState.isCustomDnsEnabled,
                     isEnabled = uiState.contentBlockersOptions.isAnyBlockerEnabled().not(),
                     onCellClicked = { newValue -> onToggleDnsClick(newValue) },
-                    onInfoClicked = { onCustomDnsInfoClick() }
+                    onInfoClicked = { navigateToCustomDnsInfo() }
                 )
             }
 
@@ -400,8 +441,8 @@ fun VpnSettingsScreen(
                     DnsCell(
                         address = item.address,
                         isUnreachableLocalDnsWarningVisible =
-                            item.isLocal && uiState.isAllowLanEnabled.not(),
-                        onClick = { onDnsClick(index) },
+                            item.isLocal && !uiState.isLocalNetworkSharingEnabled,
+                        onClick = { navigateToDns(index, item.address) },
                         modifier = Modifier.animateItemPlacement()
                     )
                     Divider()
@@ -409,7 +450,7 @@ fun VpnSettingsScreen(
 
                 itemWithDivider {
                     BaseCell(
-                        onCellClicked = { onDnsClick(null) },
+                        onCellClicked = { navigateToDns(null, null) },
                         title = {
                             Text(
                                 text = stringResource(id = R.string.add_a_server),
@@ -441,7 +482,7 @@ fun VpnSettingsScreen(
                 Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding))
                 InformationComposeCell(
                     title = stringResource(id = R.string.wireguard_port_title),
-                    onInfoClicked = onWireguardPortInfoClicked
+                    onInfoClicked = { navigateToWireguardPortInfo(uiState.availablePortRanges) }
                 )
             }
 
@@ -468,20 +509,15 @@ fun VpnSettingsScreen(
                 CustomPortCell(
                     title = stringResource(id = R.string.wireguard_custon_port_title),
                     isSelected = uiState.selectedWireguardPort.isCustom(),
-                    port =
-                        if (uiState.selectedWireguardPort.isCustom()) {
-                            uiState.selectedWireguardPort.toDisplayCustomPort()
-                        } else {
-                            savedCustomPort.value.toDisplayCustomPort()
-                        },
+                    port = uiState.customWireguardPort?.toValueOrNull(),
                     onMainCellClicked = {
-                        if (savedCustomPort.value is Constraint.Only) {
-                            onWireguardPortSelected(savedCustomPort.value)
+                        if (uiState.customWireguardPort != null) {
+                            onWireguardPortSelected(uiState.customWireguardPort)
                         } else {
-                            onShowCustomPortDialog()
+                            navigateToWireguardPortDialog()
                         }
                     },
-                    onPortCellClicked = { onShowCustomPortDialog() },
+                    onPortCellClicked = navigateToWireguardPortDialog,
                     mainTestTag = LAZY_LIST_WIREGUARD_CUSTOM_PORT_TEXT_TEST_TAG,
                     numberTestTag = LAZY_LIST_WIREGUARD_CUSTOM_PORT_NUMBER_TEST_TAG
                 )
@@ -491,7 +527,7 @@ fun VpnSettingsScreen(
                 Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding))
                 InformationComposeCell(
                     title = stringResource(R.string.obfuscation_title),
-                    onInfoClicked = { onObfuscationInfoClick() }
+                    onInfoClicked = navigateToObfuscationInfo
                 )
             }
             itemWithDivider {
@@ -505,7 +541,7 @@ fun VpnSettingsScreen(
                 SelectableCell(
                     title = stringResource(id = R.string.obfuscation_on_udp_over_tcp),
                     isSelected = uiState.selectedObfuscation == SelectedObfuscation.Udp2Tcp,
-                    onCellClicked = { onSelectObfuscationSetting(SelectedObfuscation.Udp2Tcp) }
+                    onCellClicked = navigateUdp2TcpInfo
                 )
             }
             itemWithDivider {
@@ -520,7 +556,7 @@ fun VpnSettingsScreen(
                 Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding))
                 InformationComposeCell(
                     title = stringResource(R.string.quantum_resistant_title),
-                    onInfoClicked = { onQuantumResistanceInfoClicked() }
+                    onInfoClicked = navigateToQuantumResistanceInfo
                 )
             }
             itemWithDivider {
@@ -548,7 +584,12 @@ fun VpnSettingsScreen(
                 Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding))
             }
 
-            item { MtuComposeCell(mtuValue = uiState.mtu, onEditMtu = { onMtuCellClick() }) }
+            item {
+                MtuComposeCell(
+                    mtuValue = uiState.mtu,
+                    onEditMtu = { navigateToMtuDialog(uiState.mtu.toIntOrNull()) }
+                )
+            }
             item {
                 MtuSubtitle(modifier = Modifier.testTag(LAZY_LIST_LAST_ITEM_TEST_TAG))
                 Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding))
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
index d26e8c826539..f9a02c265d1c 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/WelcomeScreen.kt
@@ -19,6 +19,7 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -30,22 +31,34 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import com.ramcosta.composedestinations.annotation.Destination
+import com.ramcosta.composedestinations.navigation.DestinationsNavigator
+import com.ramcosta.composedestinations.navigation.popUpTo
+import com.ramcosta.composedestinations.result.NavResult
+import com.ramcosta.composedestinations.result.ResultRecipient
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.NavGraphs
 import net.mullvad.mullvadvpn.compose.button.RedeemVoucherButton
 import net.mullvad.mullvadvpn.compose.button.SitePaymentButton
 import net.mullvad.mullvadvpn.compose.component.CopyAnimatedIconButton
 import net.mullvad.mullvadvpn.compose.component.PlayPayment
 import net.mullvad.mullvadvpn.compose.component.ScaffoldWithTopBar
 import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar
-import net.mullvad.mullvadvpn.compose.dialog.DeviceNameInfoDialog
+import net.mullvad.mullvadvpn.compose.destinations.AccountDestination
+import net.mullvad.mullvadvpn.compose.destinations.ConnectDestination
+import net.mullvad.mullvadvpn.compose.destinations.DeviceNameInfoDialogDestination
+import net.mullvad.mullvadvpn.compose.destinations.RedeemVoucherDestination
+import net.mullvad.mullvadvpn.compose.destinations.SettingsDestination
 import net.mullvad.mullvadvpn.compose.dialog.payment.PaymentDialog
 import net.mullvad.mullvadvpn.compose.dialog.payment.VerificationPendingDialog
 import net.mullvad.mullvadvpn.compose.state.PaymentState
 import net.mullvad.mullvadvpn.compose.state.WelcomeUiState
+import net.mullvad.mullvadvpn.compose.transitions.NoTransition
 import net.mullvad.mullvadvpn.compose.util.createCopyToClipboardHandle
+import net.mullvad.mullvadvpn.constant.IS_PLAY_BUILD
 import net.mullvad.mullvadvpn.lib.common.util.groupWithSpaces
 import net.mullvad.mullvadvpn.lib.common.util.openAccountPageInBrowser
 import net.mullvad.mullvadvpn.lib.payment.model.PaymentProduct
@@ -57,6 +70,7 @@ import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar
 import net.mullvad.mullvadvpn.lib.theme.color.AlphaTopBar
 import net.mullvad.mullvadvpn.lib.theme.color.MullvadWhite
 import net.mullvad.mullvadvpn.viewmodel.WelcomeViewModel
+import org.koin.androidx.compose.koinViewModel
 
 @Preview
 @Composable
@@ -83,11 +97,51 @@ private fun PreviewWelcomeScreen() {
             onAccountClick = {},
             openConnectScreen = {},
             onPurchaseBillingProductClick = { _, _ -> },
-            onClosePurchaseResultDialog = {}
+            onClosePurchaseResultDialog = {},
+            navigateToDeviceInfoDialog = {}
         )
     }
 }
 
+@Destination(style = NoTransition::class)
+@Composable
+fun Welcome(
+    navigator: DestinationsNavigator,
+    resultRecipient: ResultRecipient<RedeemVoucherDestination, Boolean>
+) {
+    val vm = koinViewModel<WelcomeViewModel>()
+    val state by vm.uiState.collectAsState()
+
+    resultRecipient.onNavResult {
+        // If we successfully redeemed a voucher, navigate to Connect screen
+        if (it is NavResult.Value && it.value) {
+            navigator.navigate(ConnectDestination) { popUpTo(NavGraphs.root) { inclusive = true } }
+        }
+    }
+    WelcomeScreen(
+        showSitePayment = IS_PLAY_BUILD.not(),
+        uiState = state,
+        uiSideEffect = vm.uiSideEffect,
+        onSitePaymentClick = vm::onSitePaymentClick,
+        onRedeemVoucherClick = {
+            navigator.navigate(RedeemVoucherDestination) { launchSingleTop = true }
+        },
+        onSettingsClick = { navigator.navigate(SettingsDestination) { launchSingleTop = true } },
+        onAccountClick = { navigator.navigate(AccountDestination) { launchSingleTop = true } },
+        openConnectScreen = {
+            navigator.navigate(ConnectDestination) {
+                launchSingleTop = true
+                popUpTo(NavGraphs.root) { inclusive = true }
+            }
+        },
+        navigateToDeviceInfoDialog = {
+            navigator.navigate(DeviceNameInfoDialogDestination) { launchSingleTop = true }
+        },
+        onPurchaseBillingProductClick = vm::startBillingPayment,
+        onClosePurchaseResultDialog = vm::onClosePurchaseResultDialog
+    )
+}
+
 @Composable
 fun WelcomeScreen(
     showSitePayment: Boolean,
@@ -99,7 +153,8 @@ fun WelcomeScreen(
     onAccountClick: () -> Unit,
     openConnectScreen: () -> Unit,
     onPurchaseBillingProductClick: (productId: ProductId, activityProvider: () -> Activity) -> Unit,
-    onClosePurchaseResultDialog: (success: Boolean) -> Unit
+    onClosePurchaseResultDialog: (success: Boolean) -> Unit,
+    navigateToDeviceInfoDialog: () -> Unit
 ) {
     val context = LocalContext.current
     LaunchedEffect(Unit) {
@@ -135,13 +190,6 @@ fun WelcomeScreen(
             } else {
                 MaterialTheme.colorScheme.error
             },
-        statusBarColor =
-            if (uiState.tunnelState.isSecured()) {
-                MaterialTheme.colorScheme.inversePrimary
-            } else {
-                MaterialTheme.colorScheme.error
-            },
-        navigationBarColor = MaterialTheme.colorScheme.background,
         iconTintColor =
             if (uiState.tunnelState.isSecured()) {
                     MaterialTheme.colorScheme.onPrimary
@@ -165,7 +213,7 @@ fun WelcomeScreen(
                     .background(color = MaterialTheme.colorScheme.primary)
         ) {
             // Welcome info area
-            WelcomeInfo(snackbarHostState, uiState, showSitePayment)
+            WelcomeInfo(snackbarHostState, uiState, showSitePayment, navigateToDeviceInfoDialog)
 
             Spacer(modifier = Modifier.weight(1f))
 
@@ -186,7 +234,8 @@ fun WelcomeScreen(
 private fun WelcomeInfo(
     snackbarHostState: SnackbarHostState,
     uiState: WelcomeUiState,
-    showSitePayment: Boolean
+    showSitePayment: Boolean,
+    navigateToDeviceInfoDialog: () -> Unit
 ) {
     Column {
         Text(
@@ -217,7 +266,7 @@ private fun WelcomeInfo(
 
         AccountNumberRow(snackbarHostState, uiState)
 
-        DeviceNameRow(deviceName = uiState.deviceName)
+        DeviceNameRow(deviceName = uiState.deviceName, navigateToDeviceInfoDialog)
 
         Text(
             text =
@@ -269,7 +318,7 @@ private fun AccountNumberRow(snackbarHostState: SnackbarHostState, uiState: Welc
 }
 
 @Composable
-fun DeviceNameRow(deviceName: String?) {
+fun DeviceNameRow(deviceName: String?, navigateToDeviceInfoDialog: () -> Unit) {
     Row(
         modifier = Modifier.padding(horizontal = Dimens.sideMargin),
         verticalAlignment = Alignment.CenterVertically,
@@ -288,10 +337,9 @@ fun DeviceNameRow(deviceName: String?) {
             color = MaterialTheme.colorScheme.onPrimary
         )
 
-        var showDeviceNameDialog by remember { mutableStateOf(false) }
         IconButton(
             modifier = Modifier.align(Alignment.CenterVertically),
-            onClick = { showDeviceNameDialog = true }
+            onClick = navigateToDeviceInfoDialog
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.icon_info),
@@ -299,9 +347,6 @@ fun DeviceNameRow(deviceName: String?) {
                 tint = MullvadWhite
             )
         }
-        if (showDeviceNameDialog) {
-            DeviceNameInfoDialog { showDeviceNameDialog = false }
-        }
     }
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/DeviceListUiState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/DeviceListUiState.kt
index e22aaffde2e0..e539dbafc6bb 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/DeviceListUiState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/DeviceListUiState.kt
@@ -5,13 +5,11 @@ import net.mullvad.mullvadvpn.model.Device
 data class DeviceListUiState(
     val deviceUiItems: List<DeviceListItemUiState>,
     val isLoading: Boolean,
-    val stagedDevice: Device?
 ) {
     val hasTooManyDevices = deviceUiItems.count() >= 5
 
     companion object {
-        val INITIAL =
-            DeviceListUiState(deviceUiItems = emptyList(), isLoading = true, stagedDevice = null)
+        val INITIAL = DeviceListUiState(deviceUiItems = emptyList(), isLoading = true)
     }
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt
index e78d2e9f436f..5525dee8ce88 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt
@@ -7,7 +7,6 @@ import net.mullvad.mullvadvpn.model.PortRange
 import net.mullvad.mullvadvpn.model.QuantumResistantState
 import net.mullvad.mullvadvpn.model.SelectedObfuscation
 import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
-import net.mullvad.mullvadvpn.viewmodel.StagedDns
 
 data class VpnSettingsUiState(
     val mtu: String,
@@ -16,12 +15,11 @@ data class VpnSettingsUiState(
     val isCustomDnsEnabled: Boolean,
     val customDnsItems: List<CustomDnsItem>,
     val contentBlockersOptions: DefaultDnsOptions,
-    val isAllowLanEnabled: Boolean,
     val selectedObfuscation: SelectedObfuscation,
     val quantumResistant: QuantumResistantState,
     val selectedWireguardPort: Constraint<Port>,
+    val customWireguardPort: Constraint<Port>?,
     val availablePortRanges: List<PortRange>,
-    val dialog: VpnSettingsDialog?
 ) {
 
     companion object {
@@ -32,12 +30,11 @@ data class VpnSettingsUiState(
             isCustomDnsEnabled: Boolean = false,
             customDnsItems: List<CustomDnsItem> = emptyList(),
             contentBlockersOptions: DefaultDnsOptions = DefaultDnsOptions(),
-            isAllowLanEnabled: Boolean = false,
             selectedObfuscation: SelectedObfuscation = SelectedObfuscation.Off,
             quantumResistant: QuantumResistantState = QuantumResistantState.Off,
             selectedWireguardPort: Constraint<Port> = Constraint.Any(),
+            customWireguardPort: Constraint.Only<Port>? = null,
             availablePortRanges: List<PortRange> = emptyList(),
-            dialog: VpnSettingsDialog? = null
         ) =
             VpnSettingsUiState(
                 mtu,
@@ -46,36 +43,11 @@ data class VpnSettingsUiState(
                 isCustomDnsEnabled,
                 customDnsItems,
                 contentBlockersOptions,
-                isAllowLanEnabled,
                 selectedObfuscation,
                 quantumResistant,
                 selectedWireguardPort,
+                customWireguardPort,
                 availablePortRanges,
-                dialog
             )
     }
 }
-
-interface VpnSettingsDialog {
-    data class Mtu(val mtuEditValue: String) : VpnSettingsDialog
-
-    data class Dns(val stagedDns: StagedDns) : VpnSettingsDialog
-
-    data object LocalNetworkSharingInfo : VpnSettingsDialog
-
-    data object ContentBlockersInfo : VpnSettingsDialog
-
-    data object CustomDnsInfo : VpnSettingsDialog
-
-    data object MalwareInfo : VpnSettingsDialog
-
-    data object ObfuscationInfo : VpnSettingsDialog
-
-    data object QuantumResistanceInfo : VpnSettingsDialog
-
-    data class WireguardPortInfo(val availablePortRanges: List<PortRange> = emptyList()) :
-        VpnSettingsDialog
-
-    data class CustomPort(val availablePortRanges: List<PortRange> = emptyList()) :
-        VpnSettingsDialog
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/DnsTextField.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/DnsTextField.kt
index d7aec9e417c7..388bec98bf39 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/DnsTextField.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/DnsTextField.kt
@@ -9,7 +9,7 @@ fun DnsTextField(
     value: String,
     modifier: Modifier = Modifier,
     onValueChanged: (String) -> Unit = {},
-    onSubmit: (String) -> Unit = {},
+    onSubmit: () -> Unit = {},
     placeholderText: String?,
     isEnabled: Boolean = true,
     isValidValue: Boolean = true
@@ -19,7 +19,7 @@ fun DnsTextField(
         keyboardType = KeyboardType.Text,
         modifier = modifier,
         onValueChanged = onValueChanged,
-        onSubmit = onSubmit,
+        onSubmit = { onSubmit() },
         isEnabled = isEnabled,
         placeholderText = placeholderText,
         maxCharLength = Int.MAX_VALUE,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/NoTransition.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/NoTransition.kt
new file mode 100644
index 000000000000..487ec90ea0ac
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/NoTransition.kt
@@ -0,0 +1,25 @@
+package net.mullvad.mullvadvpn.compose.transitions
+
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.core.snap
+import androidx.compose.animation.fadeOut
+import androidx.navigation.NavBackStackEntry
+import com.ramcosta.composedestinations.spec.DestinationStyle
+
+object NoTransition : DestinationStyle.Animated {
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition() =
+        EnterTransition.None
+
+    // TODO temporary hack until we have a proper solution.
+    // https://issuetracker.google.com/issues/309506799
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.exitTransition() =
+        fadeOut(snap(700))
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.popEnterTransition() =
+        EnterTransition.None
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.popExitTransition() =
+        ExitTransition.None
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/SettingsTransition.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/SettingsTransition.kt
new file mode 100644
index 000000000000..8f59476e5068
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/SettingsTransition.kt
@@ -0,0 +1,23 @@
+package net.mullvad.mullvadvpn.compose.transitions
+
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.slideOutVertically
+import androidx.navigation.NavBackStackEntry
+import com.ramcosta.composedestinations.spec.DestinationStyle
+
+object SettingsTransition : DestinationStyle.Animated {
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition() =
+        slideInVertically(initialOffsetY = { it })
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.exitTransition() =
+        slideOutHorizontally(targetOffsetX = { -it })
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.popEnterTransition() =
+        slideInHorizontally(initialOffsetX = { -it })
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.popExitTransition() =
+        slideOutVertically(targetOffsetY = { it })
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/SlideInFromBottomTransition.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/SlideInFromBottomTransition.kt
new file mode 100644
index 000000000000..6b404c2b9248
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/SlideInFromBottomTransition.kt
@@ -0,0 +1,23 @@
+package net.mullvad.mullvadvpn.compose.transitions
+
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.navigation.NavBackStackEntry
+import com.ramcosta.composedestinations.spec.DestinationStyle
+
+object SlideInFromBottomTransition : DestinationStyle.Animated {
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition():
+        EnterTransition {
+        return slideInVertically(initialOffsetY = { it })
+    }
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.popEnterTransition() = null
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.popExitTransition():
+        ExitTransition {
+        return slideOutVertically(targetOffsetY = { it })
+    }
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/SlideInFromRightTransition.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/SlideInFromRightTransition.kt
new file mode 100644
index 000000000000..9a18a2e5de52
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/transitions/SlideInFromRightTransition.kt
@@ -0,0 +1,21 @@
+package net.mullvad.mullvadvpn.compose.transitions
+
+import androidx.compose.animation.AnimatedContentTransitionScope
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.navigation.NavBackStackEntry
+import com.ramcosta.composedestinations.spec.DestinationStyle
+
+object SlideInFromRightTransition : DestinationStyle.Animated {
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition() =
+        slideInHorizontally(initialOffsetX = { it })
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.exitTransition() =
+        slideOutHorizontally(targetOffsetX = { -it })
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.popEnterTransition() =
+        slideInHorizontally(initialOffsetX = { -it })
+
+    override fun AnimatedContentTransitionScope<NavBackStackEntry>.popExitTransition() =
+        slideOutHorizontally(targetOffsetX = { it })
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
index 56df6699de97..48d941437f66 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
@@ -26,6 +26,7 @@ import net.mullvad.mullvadvpn.ui.serviceconnection.SplitTunneling
 import net.mullvad.mullvadvpn.usecase.AccountExpiryNotificationUseCase
 import net.mullvad.mullvadvpn.usecase.EmptyPaymentUseCase
 import net.mullvad.mullvadvpn.usecase.NewDeviceNotificationUseCase
+import net.mullvad.mullvadvpn.usecase.OutOfTimeUseCase
 import net.mullvad.mullvadvpn.usecase.PaymentUseCase
 import net.mullvad.mullvadvpn.usecase.PlayPaymentUseCase
 import net.mullvad.mullvadvpn.usecase.PortRangeUseCase
@@ -39,12 +40,15 @@ import net.mullvad.mullvadvpn.viewmodel.ChangelogViewModel
 import net.mullvad.mullvadvpn.viewmodel.ConnectViewModel
 import net.mullvad.mullvadvpn.viewmodel.DeviceListViewModel
 import net.mullvad.mullvadvpn.viewmodel.DeviceRevokedViewModel
+import net.mullvad.mullvadvpn.viewmodel.DnsDialogViewModel
 import net.mullvad.mullvadvpn.viewmodel.LoginViewModel
+import net.mullvad.mullvadvpn.viewmodel.MtuDialogViewModel
 import net.mullvad.mullvadvpn.viewmodel.OutOfTimeViewModel
 import net.mullvad.mullvadvpn.viewmodel.PrivacyDisclaimerViewModel
 import net.mullvad.mullvadvpn.viewmodel.ReportProblemViewModel
 import net.mullvad.mullvadvpn.viewmodel.SelectLocationViewModel
 import net.mullvad.mullvadvpn.viewmodel.SettingsViewModel
+import net.mullvad.mullvadvpn.viewmodel.SplashViewModel
 import net.mullvad.mullvadvpn.viewmodel.SplitTunnelingViewModel
 import net.mullvad.mullvadvpn.viewmodel.ViewLogsViewModel
 import net.mullvad.mullvadvpn.viewmodel.VoucherDialogViewModel
@@ -67,7 +71,7 @@ val uiModule = module {
     single<PackageManager> { androidContext().packageManager }
     single<String>(named(SELF_PACKAGE_NAME)) { androidContext().packageName }
 
-    viewModel { SplitTunnelingViewModel(get(), get(), Dispatchers.Default) }
+    viewModel { SplitTunnelingViewModel(get(), get(), get(), Dispatchers.Default) }
     single { ApplicationsIconManager(get()) } onClose { it?.dispose() }
     single { ApplicationsProvider(get(), get(named(SELF_PACKAGE_NAME))) }
 
@@ -98,6 +102,7 @@ val uiModule = module {
     single { NewDeviceNotificationUseCase(get()) }
     single { PortRangeUseCase(get()) }
     single { RelayListUseCase(get(), get()) }
+    single { OutOfTimeUseCase(get(), get()) }
 
     single { InAppNotificationController(get(), get(), get(), get(), MainScope()) }
 
@@ -124,15 +129,20 @@ val uiModule = module {
     viewModel {
         ChangelogViewModel(get(), BuildConfig.VERSION_CODE, BuildConfig.ALWAYS_SHOW_CHANGELOG)
     }
-    viewModel { ConnectViewModel(get(), get(), get(), get(), get(), get()) }
+    viewModel { ConnectViewModel(get(), get(), get(), get(), get(), get(), get()) }
     viewModel { DeviceListViewModel(get(), get()) }
     viewModel { DeviceRevokedViewModel(get(), get()) }
     viewModel { LoginViewModel(get(), get(), get()) }
+    viewModel { MtuDialogViewModel(get()) }
+    viewModel { parameters ->
+        DnsDialogViewModel(get(), get(), parameters.getOrNull(), parameters.getOrNull())
+    }
     viewModel { PrivacyDisclaimerViewModel(get()) }
     viewModel { SelectLocationViewModel(get(), get()) }
     viewModel { SettingsViewModel(get(), get()) }
+    viewModel { SplashViewModel(get(), get(), get()) }
     viewModel { VoucherDialogViewModel(get(), get()) }
-    viewModel { VpnSettingsViewModel(get(), get(), get(), get(), get()) }
+    viewModel { VpnSettingsViewModel(get(), get(), get(), get()) }
     viewModel { WelcomeViewModel(get(), get(), get(), get()) }
     viewModel { ReportProblemViewModel(get(), get()) }
     viewModel { ViewLogsViewModel(get()) }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt
index ac9637c68342..557eb7f72da2 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt
@@ -32,7 +32,7 @@ class SettingsRepository(
                 callbackFlowFromNotifier(state.container.settingsListener.settingsNotifier)
             }
             .onStart { serviceConnectionManager.settingsListener()?.settingsNotifier?.latestEvent }
-            .stateIn(CoroutineScope(dispatcher), SharingStarted.WhileSubscribed(), null)
+            .stateIn(CoroutineScope(dispatcher), SharingStarted.Lazily, null)
 
     fun setDnsOptions(
         isCustomDnsEnabled: Boolean,
@@ -51,6 +51,31 @@ class SettingsRepository(
             )
     }
 
+    fun setDnsState(
+        state: DnsState,
+    ) {
+        updateDnsSettings { it.copy(state = state) }
+    }
+
+    fun updateCustomDnsList(update: (List<InetAddress>) -> List<InetAddress>) {
+        updateDnsSettings { dnsOptions ->
+            val newDnsList = ArrayList(update(dnsOptions.customOptions.addresses.map { it }))
+            dnsOptions.copy(
+                state = if (newDnsList.isEmpty()) DnsState.Default else DnsState.Custom,
+                customOptions =
+                    CustomDnsOptions(
+                        addresses = newDnsList,
+                    )
+            )
+        }
+    }
+
+    private fun updateDnsSettings(lambda: (DnsOptions) -> DnsOptions) {
+        settingsUpdates.value?.tunnelOptions?.dnsOptions?.let {
+            serviceConnectionManager.customDns()?.setDnsOptions(lambda(it))
+        }
+    }
+
     fun setWireguardMtu(value: Int?) {
         serviceConnectionManager.settingsListener()?.wireguardMtu = value
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginState.kt
deleted file mode 100644
index cece17826792..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginState.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package net.mullvad.mullvadvpn.ui
-
-enum class LoginState {
-    Initial,
-    InProgress,
-    Success,
-    Failure,
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index f299b8c956bd..4af608579133 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -2,86 +2,47 @@ package net.mullvad.mullvadvpn.ui
 
 import android.Manifest
 import android.app.Activity
-import android.app.UiModeManager
 import android.content.Intent
-import android.content.pm.ActivityInfo
-import android.content.res.Configuration
 import android.net.VpnService
 import android.os.Bundle
 import android.util.Log
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
-import androidx.fragment.app.FragmentActivity
-import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onSubscription
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withTimeoutOrNull
-import net.mullvad.mullvadvpn.BuildConfig
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.dialog.ChangelogDialog
+import androidx.core.view.WindowCompat
+import net.mullvad.mullvadvpn.compose.screen.MullvadApp
 import net.mullvad.mullvadvpn.di.paymentModule
 import net.mullvad.mullvadvpn.di.uiModule
 import net.mullvad.mullvadvpn.lib.common.util.SdkUtils.isNotificationPermissionGranted
-import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointConfiguration
 import net.mullvad.mullvadvpn.lib.endpoint.getApiEndpointConfigurationExtras
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.model.AccountExpiry
-import net.mullvad.mullvadvpn.model.DeviceState
 import net.mullvad.mullvadvpn.repository.AccountRepository
 import net.mullvad.mullvadvpn.repository.DeviceRepository
 import net.mullvad.mullvadvpn.repository.PrivacyDisclaimerRepository
-import net.mullvad.mullvadvpn.ui.fragment.AccountFragment
-import net.mullvad.mullvadvpn.ui.fragment.ConnectFragment
-import net.mullvad.mullvadvpn.ui.fragment.DeviceRevokedFragment
-import net.mullvad.mullvadvpn.ui.fragment.LoadingFragment
-import net.mullvad.mullvadvpn.ui.fragment.LoginFragment
-import net.mullvad.mullvadvpn.ui.fragment.OutOfTimeFragment
-import net.mullvad.mullvadvpn.ui.fragment.PrivacyDisclaimerFragment
-import net.mullvad.mullvadvpn.ui.fragment.SettingsFragment
-import net.mullvad.mullvadvpn.ui.fragment.WelcomeFragment
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
-import net.mullvad.mullvadvpn.util.UNKNOWN_STATE_DEBOUNCE_DELAY_MILLISECONDS
-import net.mullvad.mullvadvpn.util.addDebounceForUnknownState
-import net.mullvad.mullvadvpn.viewmodel.ChangelogDialogUiState
 import net.mullvad.mullvadvpn.viewmodel.ChangelogViewModel
 import org.koin.android.ext.android.getKoin
 import org.koin.core.context.loadKoinModules
-import org.koin.dsl.bind
 
-open class MainActivity : FragmentActivity() {
+open class MainActivity : ComponentActivity() {
     private val requestNotificationPermissionLauncher =
         registerForActivityResult(ActivityResultContracts.RequestPermission()) {
             // NotificationManager.areNotificationsEnabled is used to check the state rather than
             // handling the callback value.
         }
 
-    private val deviceIsTv by lazy {
-        val uiModeManager = getSystemService(UI_MODE_SERVICE) as UiModeManager
-
-        uiModeManager.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION
-    }
-
     private lateinit var accountRepository: AccountRepository
     private lateinit var deviceRepository: DeviceRepository
     private lateinit var privacyDisclaimerRepository: PrivacyDisclaimerRepository
     private lateinit var serviceConnectionManager: ServiceConnectionManager
     private lateinit var changelogViewModel: ChangelogViewModel
 
-    private var deviceStateJob: Job? = null
-    private var currentDeviceState: DeviceState? = null
-
     override fun onCreate(savedInstanceState: Bundle?) {
         loadKoinModules(listOf(uiModule, paymentModule))
 
+        // Tell the system that we will draw behind the status bar and navigation bar
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
         getKoin().apply {
             accountRepository = get()
             deviceRepository = get()
@@ -90,39 +51,16 @@ open class MainActivity : FragmentActivity() {
             changelogViewModel = get()
         }
 
-        requestedOrientation =
-            if (deviceIsTv) {
-                ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-            } else {
-                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-            }
-
         super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.main)
+        setContent { AppTheme { MullvadApp() } }
     }
 
-    override fun onStart() {
-        Log.d("mullvad", "Starting main activity")
-        super.onStart()
-
-        if (privacyDisclaimerRepository.hasAcceptedPrivacyDisclosure()) {
-            initializeStateHandlerAndServiceConnection(
-                apiEndpointConfiguration = intent?.getApiEndpointConfigurationExtras()
-            )
-        } else {
-            openPrivacyDisclaimerFragment()
-        }
-    }
-
-    fun initializeStateHandlerAndServiceConnection(
-        apiEndpointConfiguration: ApiEndpointConfiguration?
-    ) {
-        deviceStateJob = launchDeviceStateHandler()
+    fun initializeStateHandlerAndServiceConnection() {
         checkForNotificationPermission()
         serviceConnectionManager.bind(
             vpnPermissionRequestHandler = ::requestVpnPermission,
-            apiEndpointConfiguration = apiEndpointConfiguration
+            apiEndpointConfiguration = intent?.getApiEndpointConfigurationExtras()
         )
     }
 
@@ -130,6 +68,14 @@ open class MainActivity : FragmentActivity() {
         serviceConnectionManager.onVpnPermissionResult(resultCode == Activity.RESULT_OK)
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        if (privacyDisclaimerRepository.hasAcceptedPrivacyDisclosure()) {
+            initializeStateHandlerAndServiceConnection()
+        }
+    }
+
     override fun onStop() {
         Log.d("mullvad", "Stopping main activity")
         super.onStop()
@@ -137,8 +83,6 @@ open class MainActivity : FragmentActivity() {
         // NOTE: `super.onStop()` must be called before unbinding due to the fragment state handling
         // otherwise the fragments will believe there was an unexpected disconnect.
         serviceConnectionManager.unbind()
-
-        deviceStateJob?.cancel()
     }
 
     override fun onDestroy() {
@@ -146,88 +90,6 @@ open class MainActivity : FragmentActivity() {
         super.onDestroy()
     }
 
-    fun openAccount() {
-        supportFragmentManager.beginTransaction().apply {
-            setCustomAnimations(
-                R.anim.fragment_enter_from_bottom,
-                R.anim.do_nothing,
-                R.anim.do_nothing,
-                R.anim.fragment_exit_to_bottom
-            )
-            replace(R.id.main_fragment, AccountFragment())
-            addToBackStack(null)
-            commitAllowingStateLoss()
-        }
-    }
-
-    fun openSettings() {
-        supportFragmentManager.beginTransaction().apply {
-            setCustomAnimations(
-                R.anim.fragment_enter_from_bottom,
-                R.anim.do_nothing,
-                R.anim.do_nothing,
-                R.anim.fragment_exit_to_bottom
-            )
-            replace(R.id.main_fragment, SettingsFragment())
-            addToBackStack(null)
-            commitAllowingStateLoss()
-        }
-    }
-
-    private fun launchDeviceStateHandler(): Job {
-        return lifecycleScope.launch {
-            launch {
-                deviceRepository.deviceState
-                    .debounce {
-                        // Debounce DeviceState.Unknown to delay view transitions during reconnect.
-                        it.addDebounceForUnknownState(UNKNOWN_STATE_DEBOUNCE_DELAY_MILLISECONDS)
-                    }
-                    .collect { newState ->
-                        if (newState != currentDeviceState)
-                            when (newState) {
-                                is DeviceState.Initial,
-                                is DeviceState.Unknown -> openLaunchView()
-                                is DeviceState.LoggedOut -> openLoginView()
-                                is DeviceState.Revoked -> openRevokedView()
-                                is DeviceState.LoggedIn -> {
-                                    openLoggedInView(
-                                        accountToken = newState.accountAndDevice.account_token,
-                                        shouldDelayLogin =
-                                            currentDeviceState is DeviceState.LoggedOut
-                                    )
-                                }
-                            }
-                        currentDeviceState = newState
-                    }
-            }
-
-            lifecycleScope.launch {
-                deviceRepository.deviceState
-                    .filter { it is DeviceState.LoggedIn || it is DeviceState.LoggedOut }
-                    .collect { loadChangelogComponent() }
-            }
-        }
-    }
-
-    private fun loadChangelogComponent() {
-        findViewById<ComposeView>(R.id.compose_view).apply {
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
-            setContent {
-                val state = changelogViewModel.uiState.collectAsState().value
-                if (state is ChangelogDialogUiState.Show) {
-                    AppTheme {
-                        ChangelogDialog(
-                            changesList = state.changes,
-                            version = BuildConfig.VERSION_NAME,
-                            onDismiss = { changelogViewModel.dismissChangelogDialog() }
-                        )
-                    }
-                }
-            }
-            changelogViewModel.refreshChangelogDialogUiState()
-        }
-    }
-
     @Suppress("DEPRECATION")
     private fun requestVpnPermission() {
         val intent = VpnService.prepare(this)
@@ -235,97 +97,9 @@ open class MainActivity : FragmentActivity() {
         startActivityForResult(intent, 0)
     }
 
-    private fun openLaunchView() {
-        supportFragmentManager.beginTransaction().apply {
-            replace(R.id.main_fragment, LoadingFragment())
-            commitAllowingStateLoss()
-        }
-    }
-
-    private fun openPrivacyDisclaimerFragment() {
-        supportFragmentManager.beginTransaction().apply {
-            replace(R.id.main_fragment, PrivacyDisclaimerFragment())
-            commitAllowingStateLoss()
-        }
-    }
-
-    private suspend fun openLoggedInView(accountToken: String, shouldDelayLogin: Boolean) {
-        val isNewAccount = accountToken == accountRepository.cachedCreatedAccount.value
-        val isExpired = isNewAccount.not() && isExpired(LOGIN_AWAIT_EXPIRY_MILLIS)
-
-        val fragment =
-            when {
-                isNewAccount -> WelcomeFragment()
-                isExpired -> {
-                    if (shouldDelayLogin) {
-                        delay(LOGIN_DELAY_MILLIS)
-                    }
-                    OutOfTimeFragment()
-                }
-                else -> {
-                    if (shouldDelayLogin) {
-                        delay(LOGIN_DELAY_MILLIS)
-                    }
-                    ConnectFragment()
-                }
-            }
-
-        supportFragmentManager.beginTransaction().apply {
-            replace(R.id.main_fragment, fragment)
-            commitAllowingStateLoss()
-        }
-    }
-
-    private suspend fun isExpired(timeoutMillis: Long): Boolean {
-        return withTimeoutOrNull(timeoutMillis) {
-            accountRepository.accountExpiryState
-                .onSubscription { accountRepository.fetchAccountExpiry() }
-                .filter { it is AccountExpiry.Available }
-                .map { it.date()?.isBeforeNow }
-                .first()
-        }
-            ?: false
-    }
-
-    private fun openLoginView() {
-        clearBackStack()
-        supportFragmentManager.beginTransaction().apply {
-            replace(R.id.main_fragment, LoginFragment())
-            commitAllowingStateLoss()
-        }
-    }
-
-    private fun openRevokedView() {
-        clearBackStack()
-        supportFragmentManager.beginTransaction().apply {
-            setCustomAnimations(
-                R.anim.fragment_enter_from_right,
-                R.anim.fragment_exit_to_left,
-                R.anim.fragment_half_enter_from_left,
-                R.anim.fragment_exit_to_right
-            )
-            replace(R.id.main_fragment, DeviceRevokedFragment())
-            commitAllowingStateLoss()
-        }
-    }
-
-    fun clearBackStack() {
-        supportFragmentManager.apply {
-            if (backStackEntryCount > 0) {
-                val firstEntry = getBackStackEntryAt(0)
-                popBackStack(firstEntry.id, FragmentManager.POP_BACK_STACK_INCLUSIVE)
-            }
-        }
-    }
-
     private fun checkForNotificationPermission() {
         if (isNotificationPermissionGranted().not()) {
             requestNotificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
         }
     }
-
-    companion object {
-        private const val LOGIN_DELAY_MILLIS = 1000L
-        private const val LOGIN_AWAIT_EXPIRY_MILLIS = 1000L
-    }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/extension/ContextExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/extension/ContextExtensions.kt
index e2e2f5c44c63..f747ae169dd7 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/extension/ContextExtensions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/extension/ContextExtensions.kt
@@ -3,18 +3,6 @@ package net.mullvad.mullvadvpn.ui.extension
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
-import androidx.fragment.app.Fragment
-import net.mullvad.mullvadvpn.ui.MainActivity
-
-fun Fragment.requireMainActivity(): MainActivity {
-    return if (this.activity is MainActivity) {
-        this.activity as MainActivity
-    } else {
-        throw IllegalStateException(
-            "Fragment $this not attached to ${MainActivity::class.simpleName}."
-        )
-    }
-}
 
 fun Context.copyToClipboard(content: String, clipboardLabel: String) {
     val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
deleted file mode 100644
index 5225368dacbb..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/AccountFragment.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.AccountScreen
-import net.mullvad.mullvadvpn.constant.IS_PLAY_BUILD
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.viewmodel.AccountViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class AccountFragment : BaseFragment() {
-    private val vm by viewModel<AccountViewModel>()
-
-    @OptIn(ExperimentalMaterial3Api::class)
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val state = vm.uiState.collectAsState().value
-                    AccountScreen(
-                        showSitePayment = IS_PLAY_BUILD.not(),
-                        uiState = state,
-                        uiSideEffect = vm.uiSideEffect,
-                        enterTransitionEndAction = vm.enterTransitionEndAction,
-                        onRedeemVoucherClick = { openRedeemVoucherFragment() },
-                        onManageAccountClick = vm::onManageAccountClick,
-                        onLogoutClick = vm::onLogoutClick,
-                        onPurchaseBillingProductClick = vm::startBillingPayment,
-                        onClosePurchaseResultDialog = vm::onClosePurchaseResultDialog,
-                        onBackClick = { activity?.onBackPressedDispatcher?.onBackPressed() }
-                    )
-                }
-            }
-        }
-    }
-
-    override fun onEnterTransitionAnimationEnd() {
-        vm.onTransitionAnimationEnd()
-    }
-
-    private fun openRedeemVoucherFragment() {
-        val transaction = parentFragmentManager.beginTransaction()
-        transaction.addToBackStack(null)
-        RedeemVoucherDialogFragment().show(transaction, null)
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/BaseFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/BaseFragment.kt
deleted file mode 100644
index 99b9b42f0982..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/BaseFragment.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.view.animation.Animation
-import android.view.animation.AnimationUtils
-import androidx.annotation.LayoutRes
-import androidx.core.view.ViewCompat
-import androidx.fragment.app.Fragment
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emptyFlow
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.util.transitionFinished
-
-abstract class BaseFragment : Fragment {
-    constructor() : super()
-
-    constructor(@LayoutRes contentLayoutId: Int) : super(contentLayoutId)
-
-    protected var transitionFinishedFlow: Flow<Unit> = emptyFlow()
-        private set
-
-    override fun onCreateAnimation(transit: Int, enter: Boolean, nextAnim: Int): Animation? {
-        val zAdjustment =
-            if (animationsToAdjustZorder.contains(nextAnim)) {
-                1f
-            } else {
-                0f
-            }
-        ViewCompat.setTranslationZ(requireView(), zAdjustment)
-        val anim =
-            if (nextAnim != 0 && enter) {
-                AnimationUtils.loadAnimation(context, nextAnim)?.apply {
-                    transitionFinishedFlow = transitionFinished()
-                }
-            } else {
-                super.onCreateAnimation(transit, enter, nextAnim)
-            }
-        anim?.let {
-            anim.setAnimationListener(
-                object : Animation.AnimationListener {
-                    override fun onAnimationStart(animation: Animation?) {}
-
-                    override fun onAnimationRepeat(animation: Animation?) {}
-
-                    override fun onAnimationEnd(animation: Animation?) {
-                        if (enter) {
-                            onEnterTransitionAnimationEnd()
-                        }
-                    }
-                },
-            )
-        }
-            ?: run {
-                if (enter) {
-                    onEnterTransitionAnimationEnd()
-                }
-            }
-        return anim
-    }
-
-    open fun onEnterTransitionAnimationEnd() {}
-
-    companion object {
-        private val animationsToAdjustZorder =
-            listOf(
-                R.anim.fragment_enter_from_right,
-                R.anim.fragment_exit_to_right,
-                R.anim.fragment_enter_from_bottom,
-                R.anim.fragment_exit_to_bottom
-            )
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt
deleted file mode 100644
index 532787ff4f44..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ConnectFragment.kt
+++ /dev/null
@@ -1,111 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import kotlinx.coroutines.flow.MutableStateFlow
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.ConnectScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.ui.MainActivity
-import net.mullvad.mullvadvpn.util.appendHideNavOnPlayBuild
-import net.mullvad.mullvadvpn.viewmodel.ConnectViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class ConnectFragment : BaseFragment() {
-
-    // Injected dependencies
-    private val connectViewModel: ConnectViewModel by viewModel()
-    private val _setNavigationBar = MutableStateFlow(false)
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val view = inflater.inflate(R.layout.fragment_compose, container, false)
-
-        view.findViewById<ComposeView>(R.id.compose_view).setContent {
-            AppTheme {
-                val state = connectViewModel.uiState.collectAsState().value
-                val drawNavbar = _setNavigationBar.collectAsState()
-                ConnectScreen(
-                    uiState = state,
-                    uiSideEffect = connectViewModel.uiSideEffect,
-                    drawNavigationBar = drawNavbar.value,
-                    onDisconnectClick = connectViewModel::onDisconnectClick,
-                    onReconnectClick = connectViewModel::onReconnectClick,
-                    onConnectClick = connectViewModel::onConnectClick,
-                    onCancelClick = connectViewModel::onCancelClick,
-                    onSwitchLocationClick = ::openSwitchLocationScreen,
-                    onToggleTunnelInfo = connectViewModel::toggleTunnelInfoExpansion,
-                    onUpdateVersionClick = { openDownloadUrl() },
-                    onManageAccountClick = connectViewModel::onManageAccountClick,
-                    onOpenOutOfTimeScreen = ::openOutOfTimeScreen,
-                    onSettingsClick = ::openSettingsView,
-                    onAccountClick = ::openAccountView,
-                    onDismissNewDeviceClick = connectViewModel::dismissNewDeviceNotification,
-                )
-            }
-        }
-
-        return view
-    }
-
-    private fun openDownloadUrl() {
-        val intent =
-            Intent(
-                    Intent.ACTION_VIEW,
-                    Uri.parse(
-                        requireContext().getString(R.string.download_url).appendHideNavOnPlayBuild()
-                    )
-                )
-                .apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK }
-        requireContext().startActivity(intent)
-    }
-
-    private fun openSwitchLocationScreen() {
-        parentFragmentManager.beginTransaction().apply {
-            setCustomAnimations(
-                R.anim.fragment_enter_from_bottom,
-                R.anim.do_nothing,
-                R.anim.do_nothing,
-                R.anim.fragment_exit_to_bottom
-            )
-            replace(R.id.main_fragment, SelectLocationFragment())
-            addToBackStack(null)
-            commitAllowingStateLoss()
-        }
-    }
-
-    private fun openOutOfTimeScreen() {
-        parentFragmentManager.beginTransaction().apply {
-            replace(R.id.main_fragment, OutOfTimeFragment())
-            commitAllowingStateLoss()
-        }
-    }
-
-    private fun openSettingsView() {
-        (context as? MainActivity)?.openSettings()
-    }
-
-    private fun openAccountView() {
-        (context as? MainActivity)?.openAccount()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        _setNavigationBar.value = false
-    }
-
-    // TODO Temporary fix for handling in & out animations until we have Compose Navigation
-    override fun onEnterTransitionAnimationEnd() {
-        super.onEnterTransitionAnimationEnd()
-        _setNavigationBar.value = true
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceListFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceListFragment.kt
deleted file mode 100644
index ab6de40dc2c3..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceListFragment.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.flowWithLifecycle
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.DeviceListScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.ui.MainActivity
-import net.mullvad.mullvadvpn.viewmodel.DeviceListViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class DeviceListFragment : Fragment() {
-
-    private val deviceListViewModel by viewModel<DeviceListViewModel>()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        lifecycleScope.launchUiSubscriptionsOnResume()
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        deviceListViewModel.accountToken = arguments?.getString(ACCOUNT_TOKEN_ARGUMENT_KEY)
-
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val state = deviceListViewModel.uiState.collectAsState().value
-                    DeviceListScreen(
-                        state = state,
-                        onBackClick = { openLoginView(doTriggerAutoLogin = false) },
-                        onContinueWithLogin = { openLoginView(doTriggerAutoLogin = true) },
-                        onSettingsClicked = this@DeviceListFragment::openSettings,
-                        onDeviceRemovalClicked = deviceListViewModel::stageDeviceForRemoval,
-                        onDismissDeviceRemovalDialog = deviceListViewModel::clearStagedDevice,
-                        onConfirmDeviceRemovalDialog =
-                            deviceListViewModel::confirmRemovalOfStagedDevice
-                    )
-                }
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        deviceListViewModel.clearStagedDevice()
-    }
-
-    private fun CoroutineScope.launchUiSubscriptionsOnResume() = launch {
-        deviceListViewModel.toastMessages
-            .flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED)
-            .collect { Toast.makeText(context, it, Toast.LENGTH_SHORT).show() }
-    }
-
-    private fun openLoginView(doTriggerAutoLogin: Boolean) {
-        parentActivity()?.clearBackStack()
-        val loginFragment =
-            LoginFragment().apply {
-                if (doTriggerAutoLogin && deviceListViewModel.accountToken != null) {
-                    arguments =
-                        Bundle().apply {
-                            putString(ACCOUNT_TOKEN_ARGUMENT_KEY, deviceListViewModel.accountToken)
-                        }
-                }
-            }
-        parentFragmentManager.beginTransaction().apply {
-            replace(R.id.main_fragment, loginFragment)
-            commitAllowingStateLoss()
-        }
-    }
-
-    private fun parentActivity(): MainActivity? {
-        return (context as? MainActivity)
-    }
-
-    private fun openSettings() = parentActivity()?.openSettings()
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceRevokedFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceRevokedFragment.kt
deleted file mode 100644
index 4b744d568a00..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/DeviceRevokedFragment.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.DeviceRevokedScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.ui.MainActivity
-import net.mullvad.mullvadvpn.viewmodel.DeviceRevokedViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class DeviceRevokedFragment : Fragment() {
-    private val deviceRevokedViewModel: DeviceRevokedViewModel by viewModel()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val state = deviceRevokedViewModel.uiState.collectAsState().value
-                    DeviceRevokedScreen(
-                        state = state,
-                        onSettingsClicked = this@DeviceRevokedFragment::openSettingsView,
-                        onGoToLoginClicked = deviceRevokedViewModel::onGoToLoginClicked
-                    )
-                }
-            }
-        }
-    }
-
-    private fun openSettingsView() {
-        (context as? MainActivity)?.openSettings()
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/FragmentArgumentConstant.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/FragmentArgumentConstant.kt
deleted file mode 100644
index 7b066b12462c..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/FragmentArgumentConstant.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-const val ACCOUNT_TOKEN_ARGUMENT_KEY = "accountToken"
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoadingFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoadingFragment.kt
deleted file mode 100644
index d2f0cbfb6e89..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoadingFragment.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.LoadingScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.ui.MainActivity
-
-class LoadingFragment : Fragment() {
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme { LoadingScreen(this@LoadingFragment::openSettings) }
-            }
-        }
-    }
-
-    private fun openSettings() {
-        (context as? MainActivity)?.openSettings()
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoginFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoginFragment.kt
deleted file mode 100644
index 92d58066ee0b..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/LoginFragment.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.platform.ComposeView
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.LoginScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.model.AccountToken
-import net.mullvad.mullvadvpn.ui.MainActivity
-import net.mullvad.mullvadvpn.viewmodel.LoginUiSideEffect
-import net.mullvad.mullvadvpn.viewmodel.LoginViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class LoginFragment : BaseFragment() {
-    private val vm: LoginViewModel by viewModel()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        // TODO: Remove this when we have a better solution for login after clearing max devices
-        val accountTokenArgument = arguments?.getString(ACCOUNT_TOKEN_ARGUMENT_KEY)
-        if (accountTokenArgument != null) {
-            // Login and set initial TextField value
-            vm.onAccountNumberChange(accountTokenArgument)
-            vm.login(accountTokenArgument)
-        }
-
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val uiState by vm.uiState.collectAsState()
-                    LaunchedEffect(Unit) {
-                        vm.uiSideEffect.collect {
-                            when (it) {
-                                LoginUiSideEffect.NavigateToWelcome,
-                                LoginUiSideEffect
-                                    .NavigateToConnect -> {} // TODO Fix when we redo navigation
-                                is LoginUiSideEffect.TooManyDevices -> {
-                                    navigateToDeviceListFragment(it.accountToken)
-                                }
-                            }
-                        }
-                    }
-                    LoginScreen(
-                        uiState,
-                        vm::login,
-                        vm::createAccount,
-                        vm::clearAccountHistory,
-                        vm::onAccountNumberChange,
-                        ::openSettingsView
-                    )
-                }
-            }
-        }
-    }
-
-    private fun navigateToDeviceListFragment(accountToken: AccountToken) {
-        val deviceFragment =
-            DeviceListFragment().apply {
-                arguments =
-                    Bundle().apply { putString(ACCOUNT_TOKEN_ARGUMENT_KEY, accountToken.value) }
-            }
-
-        parentFragmentManager.beginTransaction().apply {
-            setCustomAnimations(
-                R.anim.fragment_enter_from_right,
-                R.anim.fragment_exit_to_left,
-                R.anim.fragment_half_enter_from_left,
-                R.anim.fragment_exit_to_right
-            )
-            replace(R.id.main_fragment, deviceFragment)
-            addToBackStack(null)
-            commitAllowingStateLoss()
-        }
-    }
-
-    private fun openSettingsView() {
-        (context as? MainActivity)?.openSettings()
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt
deleted file mode 100644
index 5a1ae49e1a19..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/OutOfTimeFragment.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.OutOfTimeScreen
-import net.mullvad.mullvadvpn.constant.IS_PLAY_BUILD
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.ui.MainActivity
-import net.mullvad.mullvadvpn.viewmodel.OutOfTimeViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class OutOfTimeFragment : BaseFragment() {
-
-    private val vm by viewModel<OutOfTimeViewModel>()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val state = vm.uiState.collectAsState().value
-                    OutOfTimeScreen(
-                        showSitePayment = IS_PLAY_BUILD.not(),
-                        uiState = state,
-                        uiSideEffect = vm.uiSideEffect,
-                        onSitePaymentClick = vm::onSitePaymentClick,
-                        onRedeemVoucherClick = ::openRedeemVoucherFragment,
-                        onSettingsClick = ::openSettingsView,
-                        onAccountClick = ::openAccountView,
-                        openConnectScreen = ::advanceToConnectScreen,
-                        onDisconnectClick = vm::onDisconnectClick,
-                        onPurchaseBillingProductClick = vm::startBillingPayment,
-                        onClosePurchaseResultDialog = vm::onClosePurchaseResultDialog
-                    )
-                }
-            }
-        }
-    }
-
-    private fun openRedeemVoucherFragment() {
-        val transaction = parentFragmentManager.beginTransaction()
-        transaction.addToBackStack(null)
-        RedeemVoucherDialogFragment { wasSuccessful -> if (wasSuccessful) advanceToConnectScreen() }
-            .show(transaction, null)
-    }
-
-    private fun advanceToConnectScreen() {
-        parentFragmentManager.beginTransaction().apply {
-            replace(R.id.main_fragment, ConnectFragment())
-            commitAllowingStateLoss()
-        }
-    }
-
-    private fun openSettingsView() {
-        (context as? MainActivity)?.openSettings()
-    }
-
-    private fun openAccountView() {
-        (context as? MainActivity)?.openAccount()
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/PrivacyDisclaimerFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/PrivacyDisclaimerFragment.kt
deleted file mode 100644
index ed4538201363..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/PrivacyDisclaimerFragment.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.PrivacyDisclaimerScreen
-import net.mullvad.mullvadvpn.lib.endpoint.getApiEndpointConfigurationExtras
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.ui.MainActivity
-import net.mullvad.mullvadvpn.util.appendHideNavOnPlayBuild
-import net.mullvad.mullvadvpn.viewmodel.PrivacyDisclaimerViewModel
-import org.koin.android.ext.android.inject
-
-class PrivacyDisclaimerFragment : Fragment() {
-
-    private val privacyDisclaimerViewModel: PrivacyDisclaimerViewModel by inject()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    PrivacyDisclaimerScreen(
-                        onPrivacyPolicyLinkClicked = { openPrivacyPolicy() },
-                        onAcceptClicked = { handleAcceptedPrivacyDisclaimer() }
-                    )
-                }
-            }
-        }
-    }
-
-    private fun handleAcceptedPrivacyDisclaimer() {
-        privacyDisclaimerViewModel.setPrivacyDisclosureAccepted()
-        (activity as? MainActivity)?.initializeStateHandlerAndServiceConnection(
-            apiEndpointConfiguration = activity?.intent?.getApiEndpointConfigurationExtras()
-        )
-    }
-
-    private fun openPrivacyPolicy() {
-        val privacyPolicyUrlIntent =
-            Intent(
-                Intent.ACTION_VIEW,
-                Uri.parse(getString(R.string.privacy_policy_url).appendHideNavOnPlayBuild())
-            )
-        context?.startActivity(privacyPolicyUrlIntent)
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ProblemReportFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ProblemReportFragment.kt
deleted file mode 100644
index fd489e563f40..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ProblemReportFragment.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.ReportProblemScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.viewmodel.ReportProblemViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class ProblemReportFragment : BaseFragment() {
-    private val vm by viewModel<ReportProblemViewModel>()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val uiState = vm.uiState.collectAsState().value
-                    ReportProblemScreen(
-                        uiState,
-                        onSendReport = { email, description -> vm.sendReport(email, description) },
-                        onDismissNoEmailDialog = vm::dismissConfirmNoEmail,
-                        onClearSendResult = vm::clearSendResult,
-                        onNavigateToViewLogs = { showLogs() },
-                        updateEmail = vm::updateEmail,
-                        updateDescription = vm::updateDescription
-                    ) {
-                        activity?.onBackPressed()
-                    }
-                }
-            }
-        }
-    }
-
-    private fun showLogs() {
-        parentFragmentManager.beginTransaction().apply {
-            setCustomAnimations(
-                R.anim.fragment_enter_from_right,
-                R.anim.fragment_half_exit_to_left,
-                R.anim.fragment_half_enter_from_left,
-                R.anim.fragment_exit_to_right
-            )
-            replace(R.id.main_fragment, ViewLogsFragment())
-            addToBackStack(null)
-            commitAllowingStateLoss()
-        }
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/RedeemVoucherDialogFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/RedeemVoucherDialogFragment.kt
deleted file mode 100644
index 2730fde5479d..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/RedeemVoucherDialogFragment.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.app.Dialog
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.DialogFragment
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.RedeemVoucherDialogScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.viewmodel.VoucherDialogViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class RedeemVoucherDialogFragment(val onDialogDismiss: (Boolean) -> Unit = {}) : DialogFragment() {
-
-    private val vm by viewModel<VoucherDialogViewModel>()
-    private lateinit var voucherDialog: Dialog
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    RedeemVoucherDialogScreen(
-                        uiState = vm.uiState.collectAsState().value,
-                        onVoucherInputChange = { vm.onVoucherInputChange(it) },
-                        onRedeem = { vm.onRedeem(it) },
-                        onDismiss = {
-                            onDismiss(voucherDialog)
-                            onDialogDismiss(it)
-                        }
-                    )
-                }
-            }
-        }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        voucherDialog = super.onCreateDialog(savedInstanceState)
-        return voucherDialog
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SelectLocationFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SelectLocationFragment.kt
deleted file mode 100644
index d1c4ac72bfbf..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SelectLocationFragment.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.SelectLocationScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.viewmodel.SelectLocationViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class SelectLocationFragment : BaseFragment() {
-
-    private val vm by viewModel<SelectLocationViewModel>()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val state = vm.uiState.collectAsState().value
-                    SelectLocationScreen(
-                        uiState = state,
-                        uiCloseAction = vm.uiCloseAction,
-                        enterTransitionEndAction = vm.enterTransitionEndAction,
-                        onSelectRelay = vm::selectRelay,
-                        onSearchTermInput = vm::onSearchTermInput,
-                        onBackClick = { activity?.onBackPressedDispatcher?.onBackPressed() },
-                    )
-                }
-            }
-        }
-    }
-
-    override fun onEnterTransitionAnimationEnd() {
-        vm.onTransitionAnimationEnd()
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt
deleted file mode 100644
index e5faf6bb1171..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SettingsFragment.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import androidx.fragment.app.Fragment
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.SettingsScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.viewmodel.SettingsViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class SettingsFragment : BaseFragment() {
-    private val vm by viewModel<SettingsViewModel>()
-
-    @OptIn(ExperimentalMaterial3Api::class)
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val state = vm.uiState.collectAsState().value
-                    SettingsScreen(
-                        uiState = state,
-                        enterTransitionEndAction = vm.enterTransitionEndAction,
-                        onVpnSettingCellClick = { openVpnSettingsFragment() },
-                        onSplitTunnelingCellClick = { openSplitTunnelingFragment() },
-                        onReportProblemCellClick = { openReportProblemFragment() },
-                        onBackClick = { activity?.onBackPressed() }
-                    )
-                }
-            }
-        }
-    }
-
-    override fun onEnterTransitionAnimationEnd() {
-        vm.onTransitionAnimationEnd()
-    }
-
-    private fun openFragment(fragment: Fragment) {
-        parentFragmentManager.beginTransaction().apply {
-            setCustomAnimations(
-                R.anim.fragment_enter_from_right,
-                R.anim.fragment_exit_to_left,
-                R.anim.fragment_half_enter_from_left,
-                R.anim.fragment_exit_to_right
-            )
-            replace(R.id.main_fragment, fragment)
-            addToBackStack(null)
-            commitAllowingStateLoss()
-        }
-    }
-
-    private fun openVpnSettingsFragment() {
-        openFragment(VpnSettingsFragment())
-    }
-
-    private fun openSplitTunnelingFragment() {
-        openFragment(SplitTunnelingFragment())
-    }
-
-    private fun openReportProblemFragment() {
-        openFragment(ProblemReportFragment())
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SplitTunnelingFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SplitTunnelingFragment.kt
deleted file mode 100644
index 7004303ae8c1..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/SplitTunnelingFragment.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.applist.ApplicationsIconManager
-import net.mullvad.mullvadvpn.compose.screen.SplitTunnelingScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.viewmodel.SplitTunnelingViewModel
-import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class SplitTunnelingFragment : BaseFragment() {
-    private val viewModel: SplitTunnelingViewModel by viewModel()
-    private val applicationsIconManager: ApplicationsIconManager by inject()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val state = viewModel.uiState.collectAsState().value
-                    SplitTunnelingScreen(
-                        uiState = state,
-                        onShowSystemAppsClick = viewModel::onShowSystemAppsClick,
-                        onExcludeAppClick = viewModel::onExcludeAppClick,
-                        onIncludeAppClick = viewModel::onIncludeAppClick,
-                        onBackClick = { activity?.onBackPressedDispatcher?.onBackPressed() },
-                        onResolveIcon = { packageName ->
-                            applicationsIconManager.getAppIcon(packageName)
-                        }
-                    )
-                }
-            }
-        }
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ViewLogsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ViewLogsFragment.kt
deleted file mode 100644
index 21931ab87638..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/ViewLogsFragment.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.ViewLogsScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.viewmodel.ViewLogsViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class ViewLogsFragment : BaseFragment() {
-    private val vm by viewModel<ViewLogsViewModel>()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val uiState = vm.uiState.collectAsState()
-                    ViewLogsScreen(
-                        uiState = uiState.value,
-                        onBackClick = { activity?.onBackPressed() }
-                    )
-                }
-            }
-        }
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt
deleted file mode 100644
index 49d43e6b2770..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.VpnSettingsScreen
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.viewmodel.VpnSettingsViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class VpnSettingsFragment : BaseFragment() {
-    private val vm by viewModel<VpnSettingsViewModel>()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val state = vm.uiState.collectAsState().value
-                    VpnSettingsScreen(
-                        uiState = state,
-                        onMtuCellClick = vm::onMtuCellClick,
-                        onSaveMtuClick = vm::onSaveMtuClick,
-                        onRestoreMtuClick = vm::onRestoreMtuClick,
-                        onCancelMtuDialogClick = vm::onCancelDialogClick,
-                        onToggleAutoConnect = vm::onToggleAutoConnect,
-                        onToggleLocalNetworkSharing = vm::onToggleLocalNetworkSharing,
-                        onToggleDnsClick = vm::onToggleDnsClick,
-                        onToggleBlockAds = vm::onToggleBlockAds,
-                        onToggleBlockTrackers = vm::onToggleBlockTrackers,
-                        onToggleBlockMalware = vm::onToggleBlockMalware,
-                        onToggleBlockAdultContent = vm::onToggleBlockAdultContent,
-                        onToggleBlockGambling = vm::onToggleBlockGambling,
-                        onToggleBlockSocialMedia = vm::onToggleBlockSocialMedia,
-                        onDnsClick = vm::onDnsClick,
-                        onDnsInputChange = vm::onDnsInputChange,
-                        onSaveDnsClick = vm::onSaveDnsClick,
-                        onRemoveDnsClick = vm::onRemoveDnsClick,
-                        onCancelDnsDialogClick = vm::onCancelDns,
-                        onLocalNetworkSharingInfoClick = vm::onLocalNetworkSharingInfoClick,
-                        onContentsBlockersInfoClick = vm::onContentsBlockerInfoClick,
-                        onCustomDnsInfoClick = vm::onCustomDnsInfoClick,
-                        onMalwareInfoClick = vm::onMalwareInfoClick,
-                        onDismissInfoClick = vm::onDismissInfoClick,
-                        onBackClick = { activity?.onBackPressedDispatcher?.onBackPressed() },
-                        onStopEvent = vm::onStopEvent,
-                        toastMessagesSharedFlow = vm.toastMessages,
-                        onSelectObfuscationSetting = vm::onSelectObfuscationSetting,
-                        onObfuscationInfoClick = vm::onObfuscationInfoClick,
-                        onSelectQuantumResistanceSetting = vm::onSelectQuantumResistanceSetting,
-                        onQuantumResistanceInfoClicked = vm::onQuantumResistanceInfoClicked,
-                        onWireguardPortSelected = vm::onWireguardPortSelected,
-                        onWireguardPortInfoClicked = vm::onWireguardPortInfoClicked,
-                        onShowCustomPortDialog = vm::onShowCustomPortDialog,
-                        onCancelCustomPortDialogClick = vm::onCancelDialogClick,
-                        onCloseCustomPortDialog = vm::onCancelDialogClick
-                    )
-                }
-            }
-        }
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt
deleted file mode 100644
index 5c5e0c83f85b..000000000000
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/WelcomeFragment.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package net.mullvad.mullvadvpn.ui.fragment
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.compose.runtime.collectAsState
-import androidx.compose.ui.platform.ComposeView
-import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.screen.WelcomeScreen
-import net.mullvad.mullvadvpn.constant.IS_PLAY_BUILD
-import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.ui.MainActivity
-import net.mullvad.mullvadvpn.viewmodel.WelcomeViewModel
-import org.koin.androidx.viewmodel.ext.android.viewModel
-
-class WelcomeFragment : BaseFragment() {
-
-    private val vm by viewModel<WelcomeViewModel>()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.fragment_compose, container, false).apply {
-            findViewById<ComposeView>(R.id.compose_view).setContent {
-                AppTheme {
-                    val state = vm.uiState.collectAsState().value
-                    WelcomeScreen(
-                        showSitePayment = IS_PLAY_BUILD.not(),
-                        uiState = state,
-                        uiSideEffect = vm.uiSideEffect,
-                        onSitePaymentClick = vm::onSitePaymentClick,
-                        onRedeemVoucherClick = ::openRedeemVoucherFragment,
-                        onSettingsClick = ::openSettingsView,
-                        onAccountClick = ::openAccountView,
-                        openConnectScreen = ::advanceToConnectScreen,
-                        onPurchaseBillingProductClick = vm::startBillingPayment,
-                        onClosePurchaseResultDialog = vm::onClosePurchaseResultDialog
-                    )
-                }
-            }
-        }
-    }
-
-    private fun openRedeemVoucherFragment() {
-        val transaction = parentFragmentManager.beginTransaction()
-        transaction.addToBackStack(null)
-        RedeemVoucherDialogFragment { wasSuccessful -> if (wasSuccessful) advanceToConnectScreen() }
-            .show(transaction, null)
-    }
-
-    private fun advanceToConnectScreen() {
-        parentFragmentManager.beginTransaction().apply {
-            replace(R.id.main_fragment, ConnectFragment())
-            commitAllowingStateLoss()
-        }
-    }
-
-    private fun openSettingsView() {
-        (context as? MainActivity)?.openSettings()
-    }
-
-    private fun openAccountView() {
-        (context as? MainActivity)?.openAccount()
-    }
-}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionManager.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionManager.kt
index 7f44b0c7d486..4e1d773f1e42 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionManager.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnectionManager.kt
@@ -3,6 +3,8 @@ package net.mullvad.mullvadvpn.ui.serviceconnection
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ServiceInfo
+import android.os.Build
 import android.os.IBinder
 import android.os.Messenger
 import android.util.Log
@@ -76,7 +78,15 @@ class ServiceConnectionManager(private val context: Context) : MessageHandler {
                 }
 
                 context.startService(intent)
-                context.bindService(intent, serviceConnection, 0)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                    context.bindService(
+                        intent,
+                        serviceConnection,
+                        ServiceInfo.FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED
+                    )
+                } else {
+                    context.bindService(intent, serviceConnection, 0)
+                }
                 isBound = true
             }
         }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/OutOfTimeUseCase.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/OutOfTimeUseCase.kt
new file mode 100644
index 000000000000..33f6d795c695
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/OutOfTimeUseCase.kt
@@ -0,0 +1,62 @@
+package net.mullvad.mullvadvpn.usecase
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onStart
+import net.mullvad.mullvadvpn.lib.ipc.Event
+import net.mullvad.mullvadvpn.lib.ipc.MessageHandler
+import net.mullvad.mullvadvpn.lib.ipc.events
+import net.mullvad.mullvadvpn.model.AccountExpiry
+import net.mullvad.mullvadvpn.model.TunnelState
+import net.mullvad.mullvadvpn.repository.AccountRepository
+import net.mullvad.talpid.tunnel.ErrorStateCause
+import org.joda.time.DateTime
+
+const val accountRefreshInterval = 1000L * 60L // 1 minute
+
+class OutOfTimeUseCase(
+    private val repository: AccountRepository,
+    private val messageHandler: MessageHandler
+) {
+
+    operator fun invoke() =
+        combine(pastAccountExpiry(), isTunnelBlockedBecauseOutOfTime()) {
+                accountExpiryHasPast,
+                tunnelOutOfTime ->
+                accountExpiryHasPast or tunnelOutOfTime
+            }
+            .distinctUntilChanged()
+
+    private fun isTunnelBlockedBecauseOutOfTime() =
+        messageHandler
+            .events<Event.TunnelStateChange>()
+            .map { it.tunnelState.isTunnelErrorStateDueToExpiredAccount() }
+            .onStart { emit(false) }
+
+    private fun TunnelState.isTunnelErrorStateDueToExpiredAccount(): Boolean {
+        return ((this as? TunnelState.Error)?.errorState?.cause as? ErrorStateCause.AuthFailed)
+            ?.isCausedByExpiredAccount()
+            ?: false
+    }
+
+    private fun pastAccountExpiry(): Flow<Boolean> =
+        combine(repository.accountExpiryState, timeFlow()) { accountExpiryState, time ->
+            when (accountExpiryState) {
+                is AccountExpiry.Available -> {
+                    accountExpiryState.date()?.isBefore(time) ?: false
+                }
+                AccountExpiry.Missing -> false
+            }
+        }
+
+    private fun timeFlow() = flow {
+        while (true) {
+            emit(DateTime.now())
+            delay(accountRefreshInterval)
+        }
+    }
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt
index a754b5a6c29e..3feef0ffae86 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/FlowUtils.kt
@@ -1,38 +1,14 @@
 package net.mullvad.mullvadvpn.util
 
-import android.view.animation.Animation
-import kotlin.coroutines.EmptyCoroutineContext
 import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.take
 import kotlinx.coroutines.withTimeoutOrNull
-import net.mullvad.mullvadvpn.lib.common.util.safeOffer
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState
 import net.mullvad.talpid.util.EventNotifier
 
-fun Animation.transitionFinished(): Flow<Unit> =
-    callbackFlow {
-            val transitionAnimationListener =
-                object : Animation.AnimationListener {
-                    override fun onAnimationStart(animation: Animation?) {}
-
-                    override fun onAnimationEnd(animation: Animation?) {
-                        safeOffer(Unit)
-                    }
-
-                    override fun onAnimationRepeat(animation: Animation?) {}
-                }
-            setAnimationListener(transitionAnimationListener)
-            awaitClose {
-                Dispatchers.Main.dispatch(EmptyCoroutineContext) { setAnimationListener(null) }
-            }
-        }
-        .take(1)
-
 fun <R> Flow<ServiceConnectionState>.flatMapReadyConnectionOrDefault(
     default: Flow<R>,
     transform: (value: ServiceConnectionState.ConnectedReady) -> Flow<R>
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PortConstraintExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PortConstraintExtensions.kt
index 0a5167da2ed5..0f0708707eb8 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PortConstraintExtensions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PortConstraintExtensions.kt
@@ -16,8 +16,8 @@ fun Constraint<Port>.isCustom() =
         is Constraint.Only -> !WIREGUARD_PRESET_PORTS.contains(this.value.value)
     }
 
-fun Constraint<Port>.toDisplayCustomPort() =
+fun Constraint<Port>.toValueOrNull() =
     when (this) {
-        is Constraint.Any -> ""
-        is Constraint.Only -> this.value.value.toString()
+        is Constraint.Any -> null
+        is Constraint.Only -> this.value.value
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModel.kt
index 5f721674990a..4f4c41b9016d 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/AccountViewModel.kt
@@ -32,8 +32,6 @@ class AccountViewModel(
 ) : ViewModel() {
 
     private val _uiSideEffect = MutableSharedFlow<UiSideEffect>(extraBufferCapacity = 1)
-    private val _enterTransitionEndAction = MutableSharedFlow<Unit>()
-
     val uiSideEffect = _uiSideEffect.asSharedFlow()
 
     val uiState: StateFlow<AccountUiState> =
@@ -53,9 +51,6 @@ class AccountViewModel(
             }
             .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), AccountUiState.default())
 
-    @Suppress("konsist.ensure public properties use permitted names")
-    val enterTransitionEndAction = _enterTransitionEndAction.asSharedFlow()
-
     init {
         updateAccountExpiry()
         verifyPurchases()
@@ -74,10 +69,11 @@ class AccountViewModel(
 
     fun onLogoutClick() {
         accountRepository.logout()
+        viewModelScope.launch { _uiSideEffect.emit(UiSideEffect.NavigateToLogin) }
     }
 
-    fun onTransitionAnimationEnd() {
-        viewModelScope.launch { _enterTransitionEndAction.emit(Unit) }
+    fun onCopyAccountNumber(accountNumber: String) {
+        viewModelScope.launch { _uiSideEffect.emit(UiSideEffect.CopyAccountNumber(accountNumber)) }
     }
 
     fun startBillingPayment(productId: ProductId, activityProvider: () -> Activity) {
@@ -115,7 +111,11 @@ class AccountViewModel(
     }
 
     sealed class UiSideEffect {
+        data object NavigateToLogin : UiSideEffect()
+
         data class OpenAccountManagementPageInBrowser(val token: String) : UiSideEffect()
+
+        data class CopyAccountNumber(val accountNumber: String) : UiSideEffect()
     }
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt
index f6549cded6a9..542a5e048f9c 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModel.kt
@@ -1,8 +1,13 @@
 package net.mullvad.mullvadvpn.viewmodel
 
+import android.os.Parcelable
 import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.launch
+import kotlinx.parcelize.Parcelize
+import net.mullvad.mullvadvpn.BuildConfig
 import net.mullvad.mullvadvpn.repository.ChangelogRepository
 
 class ChangelogViewModel(
@@ -10,34 +15,26 @@ class ChangelogViewModel(
     private val buildVersionCode: Int,
     private val alwaysShowChangelog: Boolean
 ) : ViewModel() {
-    private val _uiState = MutableStateFlow<ChangelogDialogUiState>(ChangelogDialogUiState.Hide)
-    val uiState = _uiState.asStateFlow()
 
-    fun refreshChangelogDialogUiState() {
-        val shouldShowChangelogDialog =
-            alwaysShowChangelog ||
-                changelogRepository.getVersionCodeOfMostRecentChangelogShowed() < buildVersionCode
-        _uiState.value =
-            if (shouldShowChangelogDialog) {
-                val changelogList = changelogRepository.getLastVersionChanges()
-                if (changelogList.isNotEmpty()) {
-                    ChangelogDialogUiState.Show(changelogList)
-                } else {
-                    ChangelogDialogUiState.Hide
-                }
-            } else {
-                ChangelogDialogUiState.Hide
-            }
+    private val _uiSideEffect = MutableSharedFlow<ChangeLog>(replay = 1, extraBufferCapacity = 1)
+    val uiSideEffect: SharedFlow<ChangeLog> = _uiSideEffect
+
+    init {
+        if (shouldShowChangeLog()) {
+            val changeLog =
+                ChangeLog(BuildConfig.VERSION_NAME, changelogRepository.getLastVersionChanges())
+            viewModelScope.launch { _uiSideEffect.emit(changeLog) }
+        }
     }
 
-    fun dismissChangelogDialog() {
+    fun markChangeLogAsRead() {
         changelogRepository.setVersionCodeOfMostRecentChangelogShowed(buildVersionCode)
-        _uiState.value = ChangelogDialogUiState.Hide
     }
-}
 
-sealed class ChangelogDialogUiState {
-    data class Show(val changes: List<String>) : ChangelogDialogUiState()
-
-    data object Hide : ChangelogDialogUiState()
+    private fun shouldShowChangeLog(): Boolean =
+        alwaysShowChangelog ||
+            (changelogRepository.getVersionCodeOfMostRecentChangelogShowed() < buildVersionCode &&
+                changelogRepository.getLastVersionChanges().isNotEmpty())
 }
+
+@Parcelize data class ChangeLog(val version: String, val changes: List<String>) : Parcelable
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
index 9f6cec8391f1..03bd0001eb0a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt
@@ -14,6 +14,8 @@ import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
@@ -33,6 +35,7 @@ import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState
 import net.mullvad.mullvadvpn.ui.serviceconnection.authTokenCache
 import net.mullvad.mullvadvpn.ui.serviceconnection.connectionProxy
 import net.mullvad.mullvadvpn.usecase.NewDeviceNotificationUseCase
+import net.mullvad.mullvadvpn.usecase.OutOfTimeUseCase
 import net.mullvad.mullvadvpn.usecase.RelayListUseCase
 import net.mullvad.mullvadvpn.util.callbackFlowFromNotifier
 import net.mullvad.mullvadvpn.util.combine
@@ -40,7 +43,6 @@ import net.mullvad.mullvadvpn.util.daysFromNow
 import net.mullvad.mullvadvpn.util.toInAddress
 import net.mullvad.mullvadvpn.util.toOutAddress
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
-import net.mullvad.talpid.tunnel.ErrorStateCause
 
 @OptIn(FlowPreview::class)
 class ConnectViewModel(
@@ -49,7 +51,8 @@ class ConnectViewModel(
     private val deviceRepository: DeviceRepository,
     private val inAppNotificationController: InAppNotificationController,
     private val newDeviceNotificationUseCase: NewDeviceNotificationUseCase,
-    private val relayListUseCase: RelayListUseCase
+    private val relayListUseCase: RelayListUseCase,
+    private val outOfTimeUseCase: OutOfTimeUseCase
 ) : ViewModel() {
     private val _uiSideEffect = MutableSharedFlow<UiSideEffect>(extraBufferCapacity = 1)
     val uiSideEffect = _uiSideEffect.asSharedFlow()
@@ -88,9 +91,6 @@ class ConnectViewModel(
                     accountExpiry,
                     isTunnelInfoExpanded,
                     deviceName ->
-                    if (tunnelRealState.isTunnelErrorStateDueToExpiredAccount()) {
-                        _uiSideEffect.tryEmit(UiSideEffect.OpenOutOfTimeView)
-                    }
                     ConnectUiState(
                         location =
                             when (tunnelRealState) {
@@ -133,6 +133,13 @@ class ConnectViewModel(
             .debounce(UI_STATE_DEBOUNCE_DURATION_MILLIS)
             .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), ConnectUiState.INITIAL)
 
+    init {
+        viewModelScope.launch {
+            outOfTimeUseCase().filter { it }.first()
+            _uiSideEffect.emit(UiSideEffect.OutOfTime)
+        }
+    }
+
     private fun LocationInfoCache.locationCallbackFlow() = callbackFlow {
         onNewLocation = { this.trySend(it) }
         awaitClose { onNewLocation = null }
@@ -144,12 +151,6 @@ class ConnectViewModel(
     private fun ConnectionProxy.tunnelRealStateFlow(): Flow<TunnelState> =
         callbackFlowFromNotifier(this.onStateChange)
 
-    private fun TunnelState.isTunnelErrorStateDueToExpiredAccount(): Boolean {
-        return ((this as? TunnelState.Error)?.errorState?.cause as? ErrorStateCause.AuthFailed)
-            ?.isCausedByExpiredAccount()
-            ?: false
-    }
-
     fun toggleTunnelInfoExpansion() {
         _isTunnelInfoExpanded.value = _isTunnelInfoExpanded.value.not()
     }
@@ -187,7 +188,7 @@ class ConnectViewModel(
     sealed interface UiSideEffect {
         data class OpenAccountManagementPageInBrowser(val token: String) : UiSideEffect
 
-        data object OpenOutOfTimeView : UiSideEffect
+        data object OutOfTime : UiSideEffect
     }
 
     companion object {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceListViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceListViewModel.kt
index 98648e0015bb..19a458114abf 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceListViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DeviceListViewModel.kt
@@ -7,8 +7,8 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
@@ -33,22 +33,15 @@ class DeviceListViewModel(
     private val resources: Resources,
     private val dispatcher: CoroutineDispatcher = Dispatchers.Default
 ) : ViewModel() {
-    private val _stagedDeviceId = MutableStateFlow<DeviceId?>(null)
     private val _loadingDevices = MutableStateFlow<List<DeviceId>>(emptyList())
 
-    private val _toastMessages = MutableSharedFlow<String>(extraBufferCapacity = 1)
-    @Suppress("konsist.ensure public properties use permitted names")
-    val toastMessages = _toastMessages.asSharedFlow()
+    private val _uiSideEffect: MutableSharedFlow<DeviceListSideEffect> = MutableSharedFlow()
+    val uiSideEffect: SharedFlow<DeviceListSideEffect> = _uiSideEffect
 
-    @Suppress("konsist.ensure public properties use permitted names")
-    var accountToken: String? = null
     private var cachedDeviceList: List<Device>? = null
 
     val uiState =
-        combine(deviceRepository.deviceList, _stagedDeviceId, _loadingDevices) {
-                deviceList,
-                stagedDeviceId,
-                loadingDevices ->
+        combine(deviceRepository.deviceList, _loadingDevices) { deviceList, loadingDevices ->
                 val devices =
                     if (deviceList is DeviceList.Available) {
                         deviceList.devices.also { cachedDeviceList = it }
@@ -65,66 +58,47 @@ class DeviceListViewModel(
                             )
                         }
                 val isLoading = devices == null
-                val stagedDevice = devices?.firstOrNull { device -> device.id == stagedDeviceId }
                 DeviceListUiState(
                     deviceUiItems = deviceUiItems ?: emptyList(),
                     isLoading = isLoading,
-                    stagedDevice = stagedDevice
                 )
             }
             .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), DeviceListUiState.INITIAL)
 
-    fun stageDeviceForRemoval(deviceId: DeviceId) {
-        _stagedDeviceId.value = deviceId
-    }
-
-    fun clearStagedDevice() {
-        _stagedDeviceId.value = null
-    }
-
-    fun confirmRemovalOfStagedDevice() {
-        val token = accountToken
-        val stagedDeviceId = _stagedDeviceId.value
-
-        if (token != null && stagedDeviceId != null) {
-            viewModelScope.launch {
-                withContext(dispatcher) {
-                    val result =
-                        withTimeoutOrNull(DEVICE_REMOVAL_TIMEOUT_MILLIS) {
-                            deviceRepository.deviceRemovalEvent
-                                .onSubscription {
-                                    clearStagedDevice()
-                                    setLoadingDevice(stagedDeviceId)
-                                    deviceRepository.removeDevice(token, stagedDeviceId)
-                                }
-                                .filter { (deviceId, result) ->
-                                    deviceId == stagedDeviceId && result == RemoveDeviceResult.Ok
-                                }
-                                .first()
-                        }
+    fun removeDevice(accountToken: String, deviceIdToRemove: DeviceId) {
+
+        viewModelScope.launch {
+            withContext(dispatcher) {
+                val result =
+                    withTimeoutOrNull(DEVICE_REMOVAL_TIMEOUT_MILLIS) {
+                        deviceRepository.deviceRemovalEvent
+                            .onSubscription {
+                                setLoadingDevice(deviceIdToRemove)
+                                deviceRepository.removeDevice(accountToken, deviceIdToRemove)
+                            }
+                            .filter { (deviceId, result) ->
+                                deviceId == deviceIdToRemove && result == RemoveDeviceResult.Ok
+                            }
+                            .first()
+                    }
 
-                    clearLoadingDevice(stagedDeviceId)
+                clearLoadingDevice(deviceIdToRemove)
 
-                    if (result == null) {
-                        _toastMessages.tryEmit(
+                if (result == null) {
+                    _uiSideEffect.emit(
+                        DeviceListSideEffect.ShowToast(
                             resources.getString(R.string.failed_to_remove_device)
                         )
-                        refreshDeviceList()
-                    }
+                    )
+                    refreshDeviceList(accountToken)
                 }
             }
-        } else {
-            _toastMessages.tryEmit(resources.getString(R.string.error_occurred))
-            clearLoadingDevices()
-            clearStagedDevice()
-            refreshDeviceList()
         }
     }
 
     fun refreshDeviceState() = deviceRepository.refreshDeviceState()
 
-    fun refreshDeviceList() =
-        accountToken?.let { token -> deviceRepository.refreshDeviceList(token) }
+    fun refreshDeviceList(accountToken: String) = deviceRepository.refreshDeviceList(accountToken)
 
     private fun setLoadingDevice(deviceId: DeviceId) {
         _loadingDevices.value = _loadingDevices.value.toMutableList().apply { add(deviceId) }
@@ -134,11 +108,11 @@ class DeviceListViewModel(
         _loadingDevices.value = _loadingDevices.value.toMutableList().apply { remove(deviceId) }
     }
 
-    private fun clearLoadingDevices() {
-        _loadingDevices.value = emptyList()
-    }
-
     companion object {
         private const val DEVICE_REMOVAL_TIMEOUT_MILLIS = 5000L
     }
 }
+
+sealed interface DeviceListSideEffect {
+    data class ShowToast(val text: String) : DeviceListSideEffect
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DnsDialogViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DnsDialogViewModel.kt
new file mode 100644
index 000000000000..eb068f710ad8
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DnsDialogViewModel.kt
@@ -0,0 +1,177 @@
+package net.mullvad.mullvadvpn.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import java.net.InetAddress
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import net.mullvad.mullvadvpn.model.DnsOptions
+import net.mullvad.mullvadvpn.model.Settings
+import net.mullvad.mullvadvpn.repository.SettingsRepository
+import org.apache.commons.validator.routines.InetAddressValidator
+
+sealed interface DnsDialogSideEffect {
+    data object Complete : DnsDialogSideEffect
+}
+
+data class DnsDialogViewModelState(
+    val dnsOptions: DnsOptions,
+    val customDnsList: List<InetAddress>,
+    val isAllowLanEnabled: Boolean
+)
+
+data class DnsDialogViewState(
+    val ipAddress: String,
+    val validationResult: ValidationResult = ValidationResult.Success,
+    val isLocal: Boolean,
+    val isAllowLanEnabled: Boolean,
+    val isNewEntry: Boolean
+) {
+
+    fun isValid() = (validationResult is ValidationResult.Success)
+
+    sealed class ValidationResult {
+        data object Success : ValidationResult()
+
+        data object InvalidAddress : ValidationResult()
+
+        data object DuplicateAddress : ValidationResult()
+    }
+}
+
+class DnsDialogViewModel(
+    private val repository: SettingsRepository,
+    private val inetAddressValidator: InetAddressValidator,
+    private val index: Int? = null,
+    initialValue: String?,
+    private val dispatcher: CoroutineDispatcher = Dispatchers.IO,
+) : ViewModel() {
+
+    private val _ipAddressInput = MutableStateFlow(initialValue ?: EMPTY_STRING)
+
+    private val vmState = runBlocking {
+        repository.settingsUpdates
+            .filterNotNull()
+            .map {
+                val dnsState = it.tunnelOptions.dnsOptions
+                val customDnsList = it.addresses()
+                val isAllowLanEnabled = it.allowLan
+
+                DnsDialogViewModelState(
+                    dnsState,
+                    customDnsList,
+                    isAllowLanEnabled = isAllowLanEnabled
+                )
+            }
+            .stateIn(viewModelScope)
+    }
+
+    // TODO Discuss runBlocking, when do we assume we have a value?
+    val uiState: StateFlow<DnsDialogViewState> = runBlocking {
+        combine(_ipAddressInput, vmState) { ipAddress, vmState ->
+                DnsDialogViewState(
+                    ipAddress,
+                    ipAddress.validateDnsEntry(index, vmState.customDnsList),
+                    ipAddress.isLocalAddress(),
+                    isAllowLanEnabled = vmState.isAllowLanEnabled,
+                    index == null
+                )
+            }
+            .stateIn(viewModelScope)
+    }
+
+    private val _uiSideEffect = MutableSharedFlow<DnsDialogSideEffect>()
+    val uiSideEffect: SharedFlow<DnsDialogSideEffect> = _uiSideEffect
+
+    private fun String.validateDnsEntry(
+        index: Int?,
+        dnsList: List<InetAddress>
+    ): DnsDialogViewState.ValidationResult =
+        when {
+            this.isBlank() || !this.isValidIp() -> {
+                DnsDialogViewState.ValidationResult.InvalidAddress
+            }
+            InetAddress.getByName(this).isDuplicateDnsEntry(index, dnsList) -> {
+                DnsDialogViewState.ValidationResult.DuplicateAddress
+            }
+            else -> DnsDialogViewState.ValidationResult.Success
+        }
+
+    fun onDnsInputChange(ipAddress: String) {
+        _ipAddressInput.value = ipAddress
+    }
+
+    fun onSaveDnsClick() =
+        viewModelScope.launch(dispatcher) {
+            if (!uiState.value.isValid()) return@launch
+
+            val address = InetAddress.getByName(uiState.value.ipAddress)
+
+            repository.updateCustomDnsList {
+                it.toMutableList().apply {
+                    if (index != null) {
+                        set(index, address)
+                    } else {
+                        add(address)
+                    }
+                }
+            }
+
+            _uiSideEffect.emit(DnsDialogSideEffect.Complete)
+        }
+
+    fun onRemoveDnsClick() =
+        viewModelScope.launch(dispatcher) {
+            repository.updateCustomDnsList {
+                it.filter { it.hostAddress != uiState.value.ipAddress }
+            }
+            _uiSideEffect.emit(DnsDialogSideEffect.Complete)
+        }
+
+    private fun String.isValidIp(): Boolean {
+        return inetAddressValidator.isValid(this)
+    }
+
+    private fun String.isLocalAddress(): Boolean {
+        return isValidIp() && InetAddress.getByName(this).isLocalAddress()
+    }
+
+    private fun InetAddress.isLocalAddress(): Boolean {
+        return isLinkLocalAddress || isSiteLocalAddress
+    }
+
+    private fun InetAddress.isDuplicateDnsEntry(
+        currentIndex: Int? = null,
+        dnsList: List<InetAddress>
+    ): Boolean =
+        dnsList.withIndex().any { (index, entry) ->
+            if (index == currentIndex) {
+                // Ignore current index, it may be the same
+                false
+            } else {
+                entry == this
+            }
+        }
+
+    private fun List<InetAddress>.asStringAddressList(): List<CustomDnsItem> {
+        return map {
+            CustomDnsItem(address = it.hostAddress ?: EMPTY_STRING, isLocal = it.isLocalAddress())
+        }
+    }
+
+    private fun Settings.addresses() = tunnelOptions.dnsOptions.customOptions.addresses
+
+    companion object {
+        private const val EMPTY_STRING = ""
+    }
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt
index 87174f2063bc..eb9323fe2ced 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModel.kt
@@ -106,10 +106,11 @@ class LoginViewModel(
 
                         if (refreshResult.isAvailable()) {
                             // Navigate to device list
+
                             _uiSideEffect.emit(
                                 LoginUiSideEffect.TooManyDevices(AccountToken(accountToken))
                             )
-                            return@launch
+                            Idle()
                         } else {
                             // Failed to fetch devices list
                             Idle(LoginError.Unknown(result.toString()))
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/MtuDialogViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/MtuDialogViewModel.kt
new file mode 100644
index 000000000000..067a26c79fed
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/MtuDialogViewModel.kt
@@ -0,0 +1,38 @@
+package net.mullvad.mullvadvpn.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.launch
+import net.mullvad.mullvadvpn.repository.SettingsRepository
+import net.mullvad.mullvadvpn.util.isValidMtu
+
+class MtuDialogViewModel(
+    private val repository: SettingsRepository,
+    private val dispatcher: CoroutineDispatcher = Dispatchers.IO
+) : ViewModel() {
+
+    private val _uiSideEffect = MutableSharedFlow<MtuDialogSideEffect>()
+    val uiSideEffect: SharedFlow<MtuDialogSideEffect> = _uiSideEffect
+
+    fun onSaveClick(mtuValue: Int) =
+        viewModelScope.launch(dispatcher) {
+            if (mtuValue.isValidMtu()) {
+                repository.setWireguardMtu(mtuValue)
+            }
+            _uiSideEffect.emit(MtuDialogSideEffect.Complete)
+        }
+
+    fun onRestoreClick() =
+        viewModelScope.launch(dispatcher) {
+            repository.setWireguardMtu(null)
+            _uiSideEffect.emit(MtuDialogSideEffect.Complete)
+        }
+}
+
+sealed interface MtuDialogSideEffect {
+    data object Complete : MtuDialogSideEffect
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/PrivacyDisclaimerViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/PrivacyDisclaimerViewModel.kt
index c3b63bb818e4..5ddb172d7fb7 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/PrivacyDisclaimerViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/PrivacyDisclaimerViewModel.kt
@@ -1,10 +1,25 @@
 package net.mullvad.mullvadvpn.viewmodel
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.repository.PrivacyDisclaimerRepository
 
 class PrivacyDisclaimerViewModel(
     private val privacyDisclaimerRepository: PrivacyDisclaimerRepository
 ) : ViewModel() {
-    fun setPrivacyDisclosureAccepted() = privacyDisclaimerRepository.setPrivacyDisclosureAccepted()
+    private val _uiSideEffect =
+        MutableSharedFlow<PrivacyDisclaimerUiSideEffect>(extraBufferCapacity = 1)
+    val uiSideEffect = _uiSideEffect.asSharedFlow()
+
+    fun setPrivacyDisclosureAccepted() {
+        privacyDisclaimerRepository.setPrivacyDisclosureAccepted()
+        viewModelScope.launch { _uiSideEffect.emit(PrivacyDisclaimerUiSideEffect.NavigateToLogin) }
+    }
+}
+
+sealed interface PrivacyDisclaimerUiSideEffect {
+    data object NavigateToLogin : PrivacyDisclaimerUiSideEffect
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemViewModel.kt
index 82e66b0c4b98..896355a43d20 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemViewModel.kt
@@ -4,8 +4,10 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
@@ -16,7 +18,6 @@ import net.mullvad.mullvadvpn.dataproxy.UserReport
 import net.mullvad.mullvadvpn.repository.ProblemReportRepository
 
 data class ReportProblemUiState(
-    val showConfirmNoEmail: Boolean = false,
     val sendingState: SendingReportUiState? = null,
     val email: String = "",
     val description: String = "",
@@ -30,22 +31,24 @@ sealed interface SendingReportUiState {
     data class Error(val error: SendProblemReportResult.Error) : SendingReportUiState
 }
 
+sealed interface ReportProblemSideEffect {
+    data class ShowConfirmNoEmail(val email: String, val description: String) :
+        ReportProblemSideEffect
+}
+
 class ReportProblemViewModel(
     private val mullvadProblemReporter: MullvadProblemReport,
     private val problemReportRepository: ProblemReportRepository
 ) : ViewModel() {
 
-    private val showConfirmNoEmail = MutableStateFlow(false)
     private val sendingState: MutableStateFlow<SendingReportUiState?> = MutableStateFlow(null)
 
     val uiState =
         combine(
-                showConfirmNoEmail,
                 sendingState,
                 problemReportRepository.problemReport,
-            ) { showConfirmNoEmail, pendingState, userReport ->
+            ) { pendingState, userReport ->
                 ReportProblemUiState(
-                    showConfirmNoEmail = showConfirmNoEmail,
                     sendingState = pendingState,
                     email = userReport.email ?: "",
                     description = userReport.description,
@@ -53,18 +56,17 @@ class ReportProblemViewModel(
             }
             .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), ReportProblemUiState())
 
-    fun sendReport(
-        email: String,
-        description: String,
-    ) {
+    private val _uiSideEffect = MutableSharedFlow<ReportProblemSideEffect>()
+    val uiSideEffect = _uiSideEffect.asSharedFlow()
+
+    fun sendReport(email: String, description: String, skipEmptyEmailCheck: Boolean = false) {
         viewModelScope.launch {
             val userEmail = email.trim()
             val nullableEmail = if (email.isEmpty()) null else userEmail
-            if (shouldShowConfirmNoEmail(nullableEmail)) {
-                showConfirmNoEmail.tryEmit(true)
+            if (!skipEmptyEmailCheck && shouldShowConfirmNoEmail(nullableEmail)) {
+                _uiSideEffect.emit(ReportProblemSideEffect.ShowConfirmNoEmail(email, description))
             } else {
-                sendingState.tryEmit(SendingReportUiState.Sending)
-                showConfirmNoEmail.tryEmit(false)
+                sendingState.emit(SendingReportUiState.Sending)
 
                 // Ensure we show loading for at least MINIMUM_LOADING_TIME_MILLIS
                 val deferredResult = async {
@@ -87,10 +89,6 @@ class ReportProblemViewModel(
         sendingState.tryEmit(null)
     }
 
-    fun dismissConfirmNoEmail() {
-        showConfirmNoEmail.tryEmit(false)
-    }
-
     fun updateEmail(email: String) {
         problemReportRepository.setEmail(email)
     }
@@ -100,9 +98,7 @@ class ReportProblemViewModel(
     }
 
     private fun shouldShowConfirmNoEmail(userEmail: String?): Boolean =
-        userEmail.isNullOrEmpty() &&
-            !uiState.value.showConfirmNoEmail &&
-            uiState.value.sendingState !is SendingReportUiState
+        userEmail.isNullOrEmpty() && uiState.value.sendingState !is SendingReportUiState
 
     private fun SendProblemReportResult.toUiResult(email: String?): SendingReportUiState =
         when (this) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt
index 5e95674e0a6a..3bbe18a7fb77 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt
@@ -21,7 +21,6 @@ class SelectLocationViewModel(
     private val relayListUseCase: RelayListUseCase
 ) : ViewModel() {
     private val _closeAction = MutableSharedFlow<Unit>()
-    private val _enterTransitionEndAction = MutableSharedFlow<Unit>()
     private val _searchTerm = MutableStateFlow(EMPTY_SEARCH_TERM)
 
     val uiState =
@@ -47,8 +46,6 @@ class SelectLocationViewModel(
 
     @Suppress("konsist.ensure public properties use permitted names")
     val uiCloseAction = _closeAction.asSharedFlow()
-    @Suppress("konsist.ensure public properties use permitted names")
-    val enterTransitionEndAction = _enterTransitionEndAction.asSharedFlow()
 
     fun selectRelay(relayItem: RelayItem) {
         relayListUseCase.updateSelectedRelayLocation(relayItem.location)
@@ -56,10 +53,6 @@ class SelectLocationViewModel(
         viewModelScope.launch { _closeAction.emit(Unit) }
     }
 
-    fun onTransitionAnimationEnd() {
-        viewModelScope.launch { _enterTransitionEndAction.emit(Unit) }
-    }
-
     fun onSearchTermInput(searchTerm: String) {
         viewModelScope.launch { _searchTerm.emit(searchTerm) }
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt
index fb357dfe2a3a..8ef85cfca820 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt
@@ -2,13 +2,10 @@ package net.mullvad.mullvadvpn.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.compose.state.SettingsUiState
 import net.mullvad.mullvadvpn.model.DeviceState
 import net.mullvad.mullvadvpn.repository.DeviceRepository
@@ -18,7 +15,6 @@ class SettingsViewModel(
     deviceRepository: DeviceRepository,
     serviceConnectionManager: ServiceConnectionManager
 ) : ViewModel() {
-    private val _enterTransitionEndAction = MutableSharedFlow<Unit>()
 
     private val vmState: StateFlow<SettingsUiState> =
         combine(deviceRepository.deviceState, serviceConnectionManager.connectionState) {
@@ -44,11 +40,4 @@ class SettingsViewModel(
             SharingStarted.WhileSubscribed(),
             SettingsUiState(appVersion = "", isLoggedIn = false, isUpdateAvailable = false)
         )
-
-    @Suppress("konsist.ensure public properties use permitted names")
-    val enterTransitionEndAction = _enterTransitionEndAction.asSharedFlow()
-
-    fun onTransitionAnimationEnd() {
-        viewModelScope.launch { _enterTransitionEndAction.emit(Unit) }
-    }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplashViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplashViewModel.kt
new file mode 100644
index 000000000000..29b1262a537e
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplashViewModel.kt
@@ -0,0 +1,110 @@
+package net.mullvad.mullvadvpn.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.selects.onTimeout
+import kotlinx.coroutines.selects.select
+import net.mullvad.mullvadvpn.lib.ipc.Event
+import net.mullvad.mullvadvpn.lib.ipc.MessageHandler
+import net.mullvad.mullvadvpn.lib.ipc.events
+import net.mullvad.mullvadvpn.model.AccountAndDevice
+import net.mullvad.mullvadvpn.model.AccountExpiry
+import net.mullvad.mullvadvpn.model.DeviceState
+import net.mullvad.mullvadvpn.repository.DeviceRepository
+import net.mullvad.mullvadvpn.repository.PrivacyDisclaimerRepository
+
+class SplashViewModel(
+    private val privacyDisclaimerRepository: PrivacyDisclaimerRepository,
+    private val deviceRepository: DeviceRepository,
+    private val messageHandler: MessageHandler,
+) : ViewModel() {
+
+    private val _uiSideEffect =
+        MutableSharedFlow<SplashUiSideEffect>(replay = 1, extraBufferCapacity = 1)
+    val uiSideEffect = _uiSideEffect.asSharedFlow()
+
+    fun start() {
+        viewModelScope.launch {
+            if (privacyDisclaimerRepository.hasAcceptedPrivacyDisclosure()) {
+                _uiSideEffect.emit(getStartDestination())
+            } else {
+                _uiSideEffect.emit(SplashUiSideEffect.NavigateToPrivacyDisclaimer)
+            }
+        }
+    }
+
+    private suspend fun getStartDestination(): SplashUiSideEffect {
+        val deviceState =
+            deviceRepository.deviceState
+                .map {
+                    when (it) {
+                        DeviceState.Initial -> null
+                        is DeviceState.LoggedIn ->
+                            ValidStartDeviceState.LoggedIn(it.accountAndDevice)
+                        DeviceState.LoggedOut -> ValidStartDeviceState.LoggedOut
+                        DeviceState.Revoked -> ValidStartDeviceState.Revoked
+                        DeviceState.Unknown -> null
+                    }
+                }
+                .filterNotNull()
+                .first()
+
+        return when (deviceState) {
+            ValidStartDeviceState.LoggedOut -> SplashUiSideEffect.NavigateToLogin
+            ValidStartDeviceState.Revoked -> SplashUiSideEffect.NavigateToRevoked
+            is ValidStartDeviceState.LoggedIn -> getLoggedInStartDestination()
+        }
+    }
+
+    // We know the user is logged in, but we need to find out if their account has expired
+    private suspend fun getLoggedInStartDestination(): SplashUiSideEffect {
+        val expiry =
+            viewModelScope.async {
+                messageHandler.events<Event.AccountExpiryEvent>().map { it.expiry }.first()
+            }
+
+        val accountExpiry = select {
+            expiry.onAwait { it }
+            // If we don't get a response within 1 second, assume the account expiry is Missing
+            onTimeout(1000) { AccountExpiry.Missing }
+        }
+
+        return when (accountExpiry) {
+            is AccountExpiry.Available -> {
+                if (accountExpiry.expiryDateTime.isBeforeNow) {
+                    SplashUiSideEffect.NavigateToOutOfTime
+                } else {
+                    SplashUiSideEffect.NavigateToConnect
+                }
+            }
+            AccountExpiry.Missing -> SplashUiSideEffect.NavigateToConnect
+        }
+    }
+}
+
+private sealed interface ValidStartDeviceState {
+    data class LoggedIn(val accountAndDevice: AccountAndDevice) : ValidStartDeviceState
+
+    data object Revoked : ValidStartDeviceState
+
+    data object LoggedOut : ValidStartDeviceState
+}
+
+sealed interface SplashUiSideEffect {
+    data object NavigateToPrivacyDisclaimer : SplashUiSideEffect
+
+    data object NavigateToRevoked : SplashUiSideEffect
+
+    data object NavigateToLogin : SplashUiSideEffect
+
+    data object NavigateToConnect : SplashUiSideEffect
+
+    data object NavigateToOutOfTime : SplashUiSideEffect
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt
index bb543d85cfa4..994d31d6feef 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.applist.AppData
+import net.mullvad.mullvadvpn.applist.ApplicationsIconManager
 import net.mullvad.mullvadvpn.applist.ApplicationsProvider
 import net.mullvad.mullvadvpn.compose.state.SplitTunnelingUiState
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionContainer
@@ -28,7 +29,8 @@ import net.mullvad.mullvadvpn.ui.serviceconnection.splitTunneling
 class SplitTunnelingViewModel(
     private val appsProvider: ApplicationsProvider,
     private val serviceConnectionManager: ServiceConnectionManager,
-    private val dispatcher: CoroutineDispatcher
+    private val applicationsIconManager: ApplicationsIconManager,
+    private val dispatcher: CoroutineDispatcher,
 ) : ViewModel() {
 
     private val allApps = MutableStateFlow<List<AppData>?>(null)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VoucherDialogViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VoucherDialogViewModel.kt
index 07c56ff954c4..ea1219609155 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VoucherDialogViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VoucherDialogViewModel.kt
@@ -45,7 +45,7 @@ class VoucherDialogViewModel(
             }
             .shareIn(viewModelScope, SharingStarted.WhileSubscribed())
 
-    var uiState =
+    val uiState =
         _shared
             .flatMapLatest { serviceConnection ->
                 voucherRedeemer = serviceConnection.voucherRedeemer
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
index dfae3df53956..25444458a504 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
@@ -12,6 +12,8 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
@@ -32,29 +34,32 @@ import net.mullvad.mullvadvpn.model.WireguardConstraints
 import net.mullvad.mullvadvpn.repository.SettingsRepository
 import net.mullvad.mullvadvpn.usecase.PortRangeUseCase
 import net.mullvad.mullvadvpn.usecase.RelayListUseCase
-import net.mullvad.mullvadvpn.util.isValidMtu
-import org.apache.commons.validator.routines.InetAddressValidator
+import net.mullvad.mullvadvpn.util.isCustom
+
+sealed interface VpnSettingsSideEffect {
+    data class ShowToast(val message: String) : VpnSettingsSideEffect
+
+    data object NavigateToDnsDialog : VpnSettingsSideEffect
+}
 
 class VpnSettingsViewModel(
     private val repository: SettingsRepository,
-    private val inetAddressValidator: InetAddressValidator,
     private val resources: Resources,
     portRangeUseCase: PortRangeUseCase,
     private val relayListUseCase: RelayListUseCase,
     private val dispatcher: CoroutineDispatcher = Dispatchers.IO
 ) : ViewModel() {
 
-    private val _toastMessages = MutableSharedFlow<String>(extraBufferCapacity = 1)
-    @Suppress("konsist.ensure public properties use permitted names")
-    val toastMessages = _toastMessages.asSharedFlow()
+    private val _uiSideEffect = MutableSharedFlow<VpnSettingsSideEffect>(extraBufferCapacity = 1)
+    val uiSideEffect = _uiSideEffect.asSharedFlow()
 
-    private val dialogState = MutableStateFlow<VpnSettingsDialogState?>(null)
+    private val customPort = MutableStateFlow<Constraint<Port>?>(null)
 
     private val vmState =
-        combine(repository.settingsUpdates, portRangeUseCase.portRanges(), dialogState) {
+        combine(repository.settingsUpdates, portRangeUseCase.portRanges(), customPort) {
                 settings,
                 portRanges,
-                dialogState ->
+                customWgPort ->
                 VpnSettingsViewModelState(
                     mtuValue = settings?.mtuString() ?: "",
                     isAutoConnectEnabled = settings?.autoConnect ?: false,
@@ -63,12 +68,11 @@ class VpnSettingsViewModel(
                     customDnsList = settings?.addresses()?.asStringAddressList() ?: listOf(),
                     contentBlockersOptions = settings?.contentBlockersSettings()
                             ?: DefaultDnsOptions(),
-                    isAllowLanEnabled = settings?.allowLan ?: false,
                     selectedObfuscation = settings?.selectedObfuscationSettings()
                             ?: SelectedObfuscation.Off,
-                    dialogState = dialogState,
                     quantumResistant = settings?.quantumResistant() ?: QuantumResistantState.Off,
                     selectedWireguardPort = settings?.getWireguardPort() ?: Constraint.Any(),
+                    customWireguardPort = customWgPort,
                     availablePortRanges = portRanges
                 )
             }
@@ -87,142 +91,20 @@ class VpnSettingsViewModel(
                 VpnSettingsUiState.createDefault()
             )
 
-    fun onMtuCellClick() {
-        dialogState.update { VpnSettingsDialogState.MtuDialog(vmState.value.mtuValue) }
-    }
-
-    fun onSaveMtuClick(mtuValue: Int) =
+    init {
         viewModelScope.launch(dispatcher) {
-            if (mtuValue.isValidMtu()) {
-                repository.setWireguardMtu(mtuValue)
-            }
-            hideDialog()
-        }
-
-    fun onRestoreMtuClick() =
-        viewModelScope.launch(dispatcher) {
-            repository.setWireguardMtu(null)
-            hideDialog()
-        }
-
-    fun onCancelDialogClick() {
-        hideDialog()
-    }
-
-    fun onLocalNetworkSharingInfoClick() {
-        dialogState.update { VpnSettingsDialogState.LocalNetworkSharingInfoDialog }
-    }
-
-    fun onContentsBlockerInfoClick() {
-        dialogState.update { VpnSettingsDialogState.ContentBlockersInfoDialog }
-    }
-
-    fun onCustomDnsInfoClick() {
-        dialogState.update { VpnSettingsDialogState.CustomDnsInfoDialog }
-    }
-
-    fun onMalwareInfoClick() {
-        dialogState.update { VpnSettingsDialogState.MalwareInfoDialog }
-    }
-
-    fun onDismissInfoClick() {
-        hideDialog()
-    }
-
-    fun onDnsClick(index: Int? = null) {
-        val stagedDns =
-            if (index == null) {
-                StagedDns.NewDns(
-                    item = CustomDnsItem.default(),
-                    validationResult = StagedDns.ValidationResult.InvalidAddress
-                )
-            } else {
-                vmState.value.customDnsList.getOrNull(index)?.let { listItem ->
-                    StagedDns.EditDns(item = listItem, index = index)
+            val initialSettings = repository.settingsUpdates.filterNotNull().first()
+            customPort.update {
+                val initialPort = initialSettings.getWireguardPort()
+                if (initialPort.isCustom()) {
+                    initialPort
+                } else {
+                    null
                 }
             }
-
-        if (stagedDns != null) {
-            dialogState.update { VpnSettingsDialogState.DnsDialog(stagedDns) }
-        }
-    }
-
-    fun onDnsInputChange(ipAddress: String) {
-        dialogState.update { state ->
-            val dialog = state as? VpnSettingsDialogState.DnsDialog ?: return
-
-            val error =
-                when {
-                    ipAddress.isBlank() || ipAddress.isValidIp().not() -> {
-                        StagedDns.ValidationResult.InvalidAddress
-                    }
-                    ipAddress.isDuplicateDns((state.stagedDns as? StagedDns.EditDns)?.index) -> {
-                        StagedDns.ValidationResult.DuplicateAddress
-                    }
-                    else -> StagedDns.ValidationResult.Success
-                }
-
-            return@update VpnSettingsDialogState.DnsDialog(
-                stagedDns =
-                    if (dialog.stagedDns is StagedDns.EditDns) {
-                        StagedDns.EditDns(
-                            item =
-                                CustomDnsItem(
-                                    address = ipAddress,
-                                    isLocal = ipAddress.isLocalAddress()
-                                ),
-                            validationResult = error,
-                            index = dialog.stagedDns.index
-                        )
-                    } else {
-                        StagedDns.NewDns(
-                            item =
-                                CustomDnsItem(
-                                    address = ipAddress,
-                                    isLocal = ipAddress.isLocalAddress()
-                                ),
-                            validationResult = error
-                        )
-                    }
-            )
         }
     }
 
-    fun onSaveDnsClick() =
-        viewModelScope.launch(dispatcher) {
-            val dialog =
-                vmState.value.dialogState as? VpnSettingsDialogState.DnsDialog ?: return@launch
-
-            if (dialog.stagedDns.isValid().not()) return@launch
-
-            val updatedList =
-                vmState.value.customDnsList
-                    .toMutableList()
-                    .map { it.address }
-                    .toMutableList()
-                    .let { activeList ->
-                        if (dialog.stagedDns is StagedDns.EditDns) {
-                            activeList
-                                .apply {
-                                    set(dialog.stagedDns.index, dialog.stagedDns.item.address)
-                                }
-                                .asInetAddressList()
-                        } else {
-                            activeList
-                                .apply { add(dialog.stagedDns.item.address) }
-                                .asInetAddressList()
-                        }
-                    }
-
-            repository.setDnsOptions(
-                isCustomDnsEnabled = true,
-                dnsList = updatedList,
-                contentBlockersOptions = vmState.value.contentBlockersOptions
-            )
-
-            hideDialog()
-        }
-
     fun onToggleAutoConnect(isEnabled: Boolean) {
         viewModelScope.launch(dispatcher) { repository.setAutoConnect(isEnabled) }
     }
@@ -231,12 +113,19 @@ class VpnSettingsViewModel(
         viewModelScope.launch(dispatcher) { repository.setLocalNetworkSharing(isEnabled) }
     }
 
-    fun onToggleDnsClick(isEnabled: Boolean) {
-        updateCustomDnsState(isEnabled)
-        if (isEnabled && vmState.value.customDnsList.isEmpty()) {
-            onDnsClick(null)
+    fun onDnsDialogDismiss() {
+        if (vmState.value.customDnsList.isEmpty()) {
+            onToggleDnsClick(false)
+        }
+    }
+
+    fun onToggleDnsClick(enable: Boolean) {
+        repository.setDnsState(if (enable) DnsState.Custom else DnsState.Default)
+        if (enable && vmState.value.customDnsList.isEmpty()) {
+            viewModelScope.launch { _uiSideEffect.emit(VpnSettingsSideEffect.NavigateToDnsDialog) }
+        } else {
+            showApplySettingChangesWarningToast()
         }
-        showApplySettingChangesWarningToast()
     }
 
     fun onToggleBlockAds(isEnabled: Boolean) {
@@ -281,29 +170,9 @@ class VpnSettingsViewModel(
         showApplySettingChangesWarningToast()
     }
 
-    fun onRemoveDnsClick() =
-        viewModelScope.launch(dispatcher) {
-            val dialog =
-                vmState.value.dialogState as? VpnSettingsDialogState.DnsDialog ?: return@launch
-
-            val updatedList =
-                vmState.value.customDnsList
-                    .toMutableList()
-                    .filter { it.address != dialog.stagedDns.item.address }
-                    .map { it.address }
-                    .asInetAddressList()
-
-            repository.setDnsOptions(
-                isCustomDnsEnabled = vmState.value.isCustomDnsEnabled && updatedList.isNotEmpty(),
-                dnsList = updatedList,
-                contentBlockersOptions = vmState.value.contentBlockersOptions
-            )
-            hideDialog()
-        }
-
     fun onStopEvent() {
         if (vmState.value.customDnsList.isEmpty()) {
-            updateCustomDnsState(false)
+            repository.setDnsState(DnsState.Default)
         }
     }
 
@@ -318,31 +187,24 @@ class VpnSettingsViewModel(
         }
     }
 
-    fun onObfuscationInfoClick() {
-        dialogState.update { VpnSettingsDialogState.ObfuscationInfoDialog }
-    }
-
     fun onSelectQuantumResistanceSetting(quantumResistant: QuantumResistantState) {
         viewModelScope.launch(dispatcher) {
             repository.setWireguardQuantumResistant(quantumResistant)
         }
     }
 
-    fun onQuantumResistanceInfoClicked() {
-        dialogState.update { VpnSettingsDialogState.QuantumResistanceInfoDialog }
-    }
-
     fun onWireguardPortSelected(port: Constraint<Port>) {
+        if (port.isCustom()) {
+            customPort.update { port }
+        }
         relayListUseCase.updateSelectedWireguardConstraints(WireguardConstraints(port = port))
-        hideDialog()
-    }
-
-    fun onWireguardPortInfoClicked() {
-        dialogState.update { VpnSettingsDialogState.WireguardPortInfoDialog }
     }
 
-    fun onShowCustomPortDialog() {
-        dialogState.update { VpnSettingsDialogState.CustomPortDialog }
+    fun resetCustomPort() {
+        customPort.update { null }
+        relayListUseCase.updateSelectedWireguardConstraints(
+            WireguardConstraints(port = Constraint.Any())
+        )
     }
 
     private fun updateDefaultDnsOptionsViaRepository(contentBlockersOption: DefaultDnsOptions) =
@@ -354,26 +216,6 @@ class VpnSettingsViewModel(
             )
         }
 
-    private fun hideDialog() {
-        dialogState.update { null }
-    }
-
-    fun onCancelDns() {
-        if (
-            vmState.value.dialogState is VpnSettingsDialogState.DnsDialog &&
-                vmState.value.customDnsList.isEmpty()
-        ) {
-            onToggleDnsClick(false)
-        }
-        hideDialog()
-    }
-
-    private fun String.isDuplicateDns(stagedIndex: Int? = null): Boolean {
-        return vmState.value.customDnsList
-            .filterIndexed { index, listItem -> index != stagedIndex && listItem.address == this }
-            .isNotEmpty()
-    }
-
     private fun List<String>.asInetAddressList(): List<InetAddress> {
         return try {
             map { InetAddress.getByName(it) }
@@ -408,32 +250,20 @@ class VpnSettingsViewModel(
                 (relaySettings as RelaySettings.Normal).relayConstraints.wireguardConstraints.port
         }
 
-    private fun String.isValidIp(): Boolean {
-        return inetAddressValidator.isValid(this)
-    }
-
-    private fun String.isLocalAddress(): Boolean {
-        return isValidIp() && InetAddress.getByName(this).isLocalAddress()
-    }
-
     private fun InetAddress.isLocalAddress(): Boolean {
         return isLinkLocalAddress || isSiteLocalAddress
     }
 
-    private fun updateCustomDnsState(isEnabled: Boolean) {
-        viewModelScope.launch(dispatcher) {
-            repository.setDnsOptions(
-                isEnabled,
-                dnsList = vmState.value.customDnsList.map { it.address }.asInetAddressList(),
-                contentBlockersOptions = vmState.value.contentBlockersOptions
+    private fun showApplySettingChangesWarningToast() {
+        viewModelScope.launch {
+            _uiSideEffect.emit(
+                VpnSettingsSideEffect.ShowToast(
+                    resources.getString(R.string.settings_changes_effect_warning_short)
+                )
             )
         }
     }
 
-    private fun showApplySettingChangesWarningToast() {
-        _toastMessages.tryEmit(resources.getString(R.string.settings_changes_effect_warning_short))
-    }
-
     companion object {
         private const val EMPTY_STRING = ""
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt
index 2ebc2b397cac..fd236e840573 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt
@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.viewmodel
 
-import net.mullvad.mullvadvpn.compose.state.VpnSettingsDialog
 import net.mullvad.mullvadvpn.compose.state.VpnSettingsUiState
 import net.mullvad.mullvadvpn.model.Constraint
 import net.mullvad.mullvadvpn.model.DefaultDnsOptions
@@ -14,14 +13,13 @@ data class VpnSettingsViewModelState(
     val isAutoConnectEnabled: Boolean,
     val isLocalNetworkSharingEnabled: Boolean,
     val isCustomDnsEnabled: Boolean,
-    val isAllowLanEnabled: Boolean,
     val customDnsList: List<CustomDnsItem>,
     val contentBlockersOptions: DefaultDnsOptions,
     val selectedObfuscation: SelectedObfuscation,
     val quantumResistant: QuantumResistantState,
     val selectedWireguardPort: Constraint<Port>,
+    val customWireguardPort: Constraint<Port>?,
     val availablePortRanges: List<PortRange>,
-    val dialogState: VpnSettingsDialogState?,
 ) {
     fun toUiState(): VpnSettingsUiState =
         VpnSettingsUiState(
@@ -31,12 +29,11 @@ data class VpnSettingsViewModelState(
             isCustomDnsEnabled,
             customDnsList,
             contentBlockersOptions,
-            isAllowLanEnabled,
             selectedObfuscation,
             quantumResistant,
             selectedWireguardPort,
+            customWireguardPort,
             availablePortRanges,
-            dialogState.toUi(this@VpnSettingsViewModelState)
         )
 
     companion object {
@@ -50,86 +47,15 @@ data class VpnSettingsViewModelState(
                 isCustomDnsEnabled = false,
                 customDnsList = listOf(),
                 contentBlockersOptions = DefaultDnsOptions(),
-                isAllowLanEnabled = false,
-                dialogState = null,
                 selectedObfuscation = SelectedObfuscation.Auto,
                 quantumResistant = QuantumResistantState.Off,
                 selectedWireguardPort = Constraint.Any(),
+                customWireguardPort = null,
                 availablePortRanges = emptyList()
             )
     }
 }
 
-private fun VpnSettingsDialogState?.toUi(
-    vpnSettingsViewModelState: VpnSettingsViewModelState
-): VpnSettingsDialog? =
-    when (this) {
-        VpnSettingsDialogState.ContentBlockersInfoDialog -> VpnSettingsDialog.ContentBlockersInfo
-        VpnSettingsDialogState.CustomDnsInfoDialog -> VpnSettingsDialog.CustomDnsInfo
-        VpnSettingsDialogState.CustomPortDialog ->
-            VpnSettingsDialog.CustomPort(vpnSettingsViewModelState.availablePortRanges)
-        is VpnSettingsDialogState.DnsDialog -> VpnSettingsDialog.Dns(stagedDns)
-        VpnSettingsDialogState.LocalNetworkSharingInfoDialog ->
-            VpnSettingsDialog.LocalNetworkSharingInfo
-        VpnSettingsDialogState.MalwareInfoDialog -> VpnSettingsDialog.MalwareInfo
-        is VpnSettingsDialogState.MtuDialog -> VpnSettingsDialog.Mtu(mtuEditValue)
-        VpnSettingsDialogState.ObfuscationInfoDialog -> VpnSettingsDialog.ObfuscationInfo
-        VpnSettingsDialogState.QuantumResistanceInfoDialog ->
-            VpnSettingsDialog.QuantumResistanceInfo
-        VpnSettingsDialogState.WireguardPortInfoDialog ->
-            VpnSettingsDialog.WireguardPortInfo(vpnSettingsViewModelState.availablePortRanges)
-        null -> null
-    }
-
-sealed class VpnSettingsDialogState {
-
-    data class MtuDialog(val mtuEditValue: String) : VpnSettingsDialogState()
-
-    data class DnsDialog(val stagedDns: StagedDns) : VpnSettingsDialogState()
-
-    data object LocalNetworkSharingInfoDialog : VpnSettingsDialogState()
-
-    data object ContentBlockersInfoDialog : VpnSettingsDialogState()
-
-    data object CustomDnsInfoDialog : VpnSettingsDialogState()
-
-    data object MalwareInfoDialog : VpnSettingsDialogState()
-
-    data object ObfuscationInfoDialog : VpnSettingsDialogState()
-
-    data object QuantumResistanceInfoDialog : VpnSettingsDialogState()
-
-    data object WireguardPortInfoDialog : VpnSettingsDialogState()
-
-    data object CustomPortDialog : VpnSettingsDialogState()
-}
-
-sealed interface StagedDns {
-    val item: CustomDnsItem
-    val validationResult: ValidationResult
-
-    data class NewDns(
-        override val item: CustomDnsItem,
-        override val validationResult: ValidationResult = ValidationResult.Success,
-    ) : StagedDns
-
-    data class EditDns(
-        override val item: CustomDnsItem,
-        override val validationResult: ValidationResult = ValidationResult.Success,
-        val index: Int
-    ) : StagedDns
-
-    sealed class ValidationResult {
-        data object Success : ValidationResult()
-
-        data object InvalidAddress : ValidationResult()
-
-        data object DuplicateAddress : ValidationResult()
-    }
-
-    fun isValid() = (validationResult is ValidationResult.Success)
-}
-
 data class CustomDnsItem(val address: String, val isLocal: Boolean) {
     companion object {
         private const val EMPTY_STRING = ""
diff --git a/android/app/src/main/res/layout/fragment_compose.xml b/android/app/src/main/res/layout/fragment_compose.xml
deleted file mode 100644
index a3a147d9971f..000000000000
--- a/android/app/src/main/res/layout/fragment_compose.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
-    <androidx.compose.ui.platform.ComposeView android:id="@+id/compose_view"
-                                              android:layout_width="match_parent"
-                                              android:layout_height="match_parent" />
-</FrameLayout>
diff --git a/android/app/src/main/res/layout/main.xml b/android/app/src/main/res/layout/main.xml
deleted file mode 100644
index 8e7356e766ee..000000000000
--- a/android/app/src/main/res/layout/main.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/main_fragment"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             android:filterTouchesWhenObscured="true">
-    <!-- this component added to be able show compose dialog -->
-    <androidx.compose.ui.platform.ComposeView android:id="@+id/compose_view"
-                                              android:layout_width="match_parent"
-                                              android:layout_height="@dimen/zero_size" />
-</FrameLayout>
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/OutOfTimeUseCaseTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/OutOfTimeUseCaseTest.kt
new file mode 100644
index 000000000000..89eb7b30d31f
--- /dev/null
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/OutOfTimeUseCaseTest.kt
@@ -0,0 +1,100 @@
+package net.mullvad.mullvadvpn.usecase
+
+import app.cash.turbine.test
+import io.mockk.every
+import io.mockk.mockk
+import kotlin.test.assertEquals
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.test.runTest
+import net.mullvad.mullvadvpn.lib.ipc.Event
+import net.mullvad.mullvadvpn.lib.ipc.MessageHandler
+import net.mullvad.mullvadvpn.lib.ipc.events
+import net.mullvad.mullvadvpn.model.AccountExpiry
+import net.mullvad.mullvadvpn.model.TunnelState
+import net.mullvad.mullvadvpn.repository.AccountRepository
+import net.mullvad.talpid.tunnel.ErrorState
+import net.mullvad.talpid.tunnel.ErrorStateCause
+import org.joda.time.DateTime
+import org.junit.Before
+import org.junit.Test
+
+class OutOfTimeUseCaseTest {
+
+    private val mockAccountRepository: AccountRepository = mockk()
+    private val mockMessageHandler: MessageHandler = mockk()
+
+    private val events = MutableSharedFlow<Event.TunnelStateChange>()
+    private val expiry = MutableStateFlow<AccountExpiry>(AccountExpiry.Missing)
+
+    lateinit var outOfTimeUseCase: OutOfTimeUseCase
+
+    @Before
+    fun setup() {
+        every { mockAccountRepository.accountExpiryState } returns expiry
+        every { mockMessageHandler.events<Event.TunnelStateChange>() } returns events
+        outOfTimeUseCase = OutOfTimeUseCase(mockAccountRepository, mockMessageHandler)
+    }
+
+    @Test
+    fun `No events should result in no expiry`() = runTest {
+        // Arrange
+        // Act, Assert
+        outOfTimeUseCase().test { assertEquals(false, awaitItem()) }
+    }
+
+    @Test
+    fun `Tunnel is blocking because out of time should emit true`() = runTest {
+        // Arrange
+        // Act, Assert
+        val errorStateCause = ErrorStateCause.AuthFailed("[EXPIRED_ACCOUNT]")
+        val tunnelStateError = TunnelState.Error(ErrorState(errorStateCause, true))
+        val errorChange = Event.TunnelStateChange(tunnelStateError)
+
+        outOfTimeUseCase().test {
+            assertEquals(false, awaitItem())
+            events.emit(errorChange)
+            assertEquals(true, awaitItem())
+        }
+    }
+
+    @Test
+    fun `Account expiry that has expired should emit true`() = runTest {
+        // Arrange
+        val expiredAccountExpiry = AccountExpiry.Available(DateTime.now().minusDays(1))
+        // Act, Assert
+        outOfTimeUseCase().test {
+            assertEquals(false, awaitItem())
+            expiry.emit(expiredAccountExpiry)
+            assertEquals(true, awaitItem())
+        }
+    }
+
+    @Test
+    fun `Account expiry that has not expired should emit nothing`() = runTest {
+        // Arrange
+        val expiredAccountExpiry = AccountExpiry.Available(DateTime.now().plusDays(1))
+
+        // Act, Assert
+        outOfTimeUseCase().test {
+            assertEquals(false, awaitItem())
+            expiry.emit(expiredAccountExpiry)
+            expectNoEvents()
+        }
+    }
+
+    @Test
+    fun `Account that expires without new expiry event`() = runTest {
+        // Arrange
+        val expiredAccountExpiry = AccountExpiry.Available(DateTime.now().plusSeconds(2))
+
+        // Act, Assert
+        outOfTimeUseCase().test {
+            // Initial event that doesn't change
+            assertEquals(false, awaitItem())
+            expiry.emit(expiredAccountExpiry)
+
+            assertEquals(true, awaitItem())
+        }
+    }
+}
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt
index e223a1253980..742f28e77d88 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt
@@ -8,27 +8,30 @@ import io.mockk.impl.annotations.MockK
 import io.mockk.just
 import io.mockk.mockkStatic
 import io.mockk.unmockkAll
-import io.mockk.verify
-import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
 import kotlinx.coroutines.test.runTest
+import net.mullvad.mullvadvpn.lib.common.test.TestCoroutineRule
 import net.mullvad.mullvadvpn.repository.ChangelogRepository
 import org.junit.After
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 
 class ChangelogViewModelTest {
+    @get:Rule val testCoroutineRule = TestCoroutineRule()
 
     @MockK private lateinit var mockedChangelogRepository: ChangelogRepository
 
     private lateinit var viewModel: ChangelogViewModel
 
+    private val buildVersionCode = 10
+
     @Before
     fun setup() {
         MockKAnnotations.init(this)
         mockkStatic(EVENT_NOTIFIER_EXTENSION_CLASS)
         every { mockedChangelogRepository.setVersionCodeOfMostRecentChangelogShowed(any()) } just
             Runs
-        viewModel = ChangelogViewModel(mockedChangelogRepository, 1, false)
     }
 
     @After
@@ -37,50 +40,36 @@ class ChangelogViewModelTest {
     }
 
     @Test
-    fun testInitialState() = runTest {
-        // Arrange, Act, Assert
-        viewModel.uiState.test { assertEquals(ChangelogDialogUiState.Hide, awaitItem()) }
+    fun testUpToDateVersionCode() = runTest {
+        // Arrange
+        every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns
+            buildVersionCode
+        viewModel = ChangelogViewModel(mockedChangelogRepository, buildVersionCode, false)
+
+        // If we have the most up to date version code, we should not show the changelog dialog
+        viewModel.uiSideEffect.test { expectNoEvents() }
     }
 
     @Test
-    fun testShowAndDismissChangelogDialog() = runTest {
-        viewModel.uiState.test {
-            // Arrange
-            val fakeList = listOf("test")
-            every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns
-                -1
-            every { mockedChangelogRepository.getLastVersionChanges() } returns fakeList
-
-            // Assert initial ui state
-            assertEquals(ChangelogDialogUiState.Hide, awaitItem())
+    fun testNotUpToDateVersionCode() = runTest {
+        // Arrange
+        every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns -1
+        every { mockedChangelogRepository.getLastVersionChanges() } returns listOf("bla", "bla")
 
-            // Refresh and verify that the dialog should be shown
-            viewModel.refreshChangelogDialogUiState()
-            assertEquals(ChangelogDialogUiState.Show(fakeList), awaitItem())
-
-            // Dismiss dialog and verify that the dialog should be hidden
-            viewModel.dismissChangelogDialog()
-            assertEquals(ChangelogDialogUiState.Hide, awaitItem())
-            verify { mockedChangelogRepository.setVersionCodeOfMostRecentChangelogShowed(1) }
-        }
+        viewModel = ChangelogViewModel(mockedChangelogRepository, buildVersionCode, false)
+        // Given a new version with a change log we should return it
+        viewModel.uiSideEffect.test { assertNotNull(awaitItem()) }
     }
 
     @Test
-    fun testShowCaseChangelogWithEmptyListDialog() = runTest {
-        viewModel.uiState.test {
-            // Arrange
-            val fakeEmptyList = emptyList<String>()
-            every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns
-                -1
-            every { mockedChangelogRepository.getLastVersionChanges() } returns fakeEmptyList
-
-            // Assert initial ui state
-            assertEquals(ChangelogDialogUiState.Hide, awaitItem())
+    fun testNotUpToDateVersionCodeWithEmptyChangeLog() = runTest {
+        // Arrange
+        every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns -1
+        every { mockedChangelogRepository.getLastVersionChanges() } returns emptyList()
 
-            // Refresh and verify that the Ui state remain same due list being empty
-            viewModel.refreshChangelogDialogUiState()
-            expectNoEvents()
-        }
+        viewModel = ChangelogViewModel(mockedChangelogRepository, buildVersionCode, false)
+        // Given a new version with a change log we should not return it
+        viewModel.uiSideEffect.test { expectNoEvents() }
     }
 
     companion object {
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
index 1b2e262b3dd4..afd7d0ea41fc 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModelTest.kt
@@ -39,10 +39,10 @@ import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionState
 import net.mullvad.mullvadvpn.ui.serviceconnection.authTokenCache
 import net.mullvad.mullvadvpn.ui.serviceconnection.connectionProxy
+import net.mullvad.mullvadvpn.usecase.OutOfTimeUseCase
 import net.mullvad.mullvadvpn.usecase.RelayListUseCase
 import net.mullvad.mullvadvpn.util.appVersionCallbackFlow
 import net.mullvad.talpid.tunnel.ErrorState
-import net.mullvad.talpid.tunnel.ErrorStateCause
 import net.mullvad.talpid.util.EventNotifier
 import org.junit.After
 import org.junit.Before
@@ -99,6 +99,11 @@ class ConnectViewModelTest {
     // Flows
     private val selectedRelayFlow = MutableStateFlow<RelayItem?>(null)
 
+    // Out Of Time Use Case
+
+    private val outOfTimeUseCase: OutOfTimeUseCase = mockk()
+    private val outOfTimeViewFlow = MutableStateFlow(false)
+
     @Before
     fun setup() {
         mockkStatic(CACHE_EXTENSION_CLASS)
@@ -132,6 +137,7 @@ class ConnectViewModelTest {
         // Flows
         every { mockRelayListUseCase.selectedRelayItem() } returns selectedRelayFlow
 
+        every { outOfTimeUseCase() } returns outOfTimeViewFlow
         viewModel =
             ConnectViewModel(
                 serviceConnectionManager = mockServiceConnectionManager,
@@ -139,7 +145,8 @@ class ConnectViewModelTest {
                 deviceRepository = mockDeviceRepository,
                 inAppNotificationController = mockInAppNotificationController,
                 relayListUseCase = mockRelayListUseCase,
-                newDeviceNotificationUseCase = mockk()
+                newDeviceNotificationUseCase = mockk(),
+                outOfTimeUseCase = outOfTimeUseCase
             )
     }
 
@@ -337,8 +344,6 @@ class ConnectViewModelTest {
     fun testOutOfTimeUiSideEffect() =
         runTest(testCoroutineRule.testDispatcher) {
             // Arrange
-            val errorStateCause = ErrorStateCause.AuthFailed("[EXPIRED_ACCOUNT]")
-            val tunnelRealStateTestItem = TunnelState.Error(ErrorState(errorStateCause, true))
             val deferred = async { viewModel.uiSideEffect.first() }
 
             // Act
@@ -347,12 +352,12 @@ class ConnectViewModelTest {
                 serviceConnectionState.value =
                     ServiceConnectionState.ConnectedReady(mockServiceConnectionContainer)
                 locationSlot.captured.invoke(mockLocation)
-                eventNotifierTunnelRealState.notify(tunnelRealStateTestItem)
+                outOfTimeViewFlow.value = true
                 awaitItem()
             }
 
             // Assert
-            assertIs<ConnectViewModel.UiSideEffect.OpenOutOfTimeView>(deferred.await())
+            assertIs<ConnectViewModel.UiSideEffect.OutOfTime>(deferred.await())
         }
 
     companion object {
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemModelTest.kt
index e0b1c5274c5e..f3f96b9c16f5 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ReportProblemModelTest.kt
@@ -87,16 +87,25 @@ class ReportProblemModelTest {
         coEvery { mockMullvadProblemReport.sendReport(any()) } returns
             SendProblemReportResult.Success
         val email = ""
+        val description = "My description"
 
         // Act, Assert
         viewModel.uiState.test {
-            assertEquals(ReportProblemUiState(false, null), awaitItem())
-            viewModel.sendReport(email, "My description")
-            assertEquals(ReportProblemUiState(true, null), awaitItem())
-            viewModel.sendReport(email, "My description")
-            assertEquals(ReportProblemUiState(false, SendingReportUiState.Sending), awaitItem())
+            assertEquals(ReportProblemUiState(), awaitItem())
+            viewModel.updateDescription(description)
+            assertEquals(ReportProblemUiState(description = description), awaitItem())
+
+            viewModel.sendReport(email, description, true)
             assertEquals(
-                ReportProblemUiState(false, SendingReportUiState.Success(null)),
+                ReportProblemUiState(SendingReportUiState.Sending, email, description),
+                awaitItem()
+            )
+            assertEquals(
+                ReportProblemUiState(
+                    SendingReportUiState.Success(null),
+                    email,
+                    description,
+                ),
                 awaitItem()
             )
         }
@@ -109,16 +118,33 @@ class ReportProblemModelTest {
         coEvery { mockMullvadProblemReport.sendReport(any()) } returns
             SendProblemReportResult.Success
         val email = "my@email.com"
+        val description = "My description"
 
         // Act, Assert
         viewModel.uiState.test {
-            assertEquals(awaitItem(), ReportProblemUiState(false, null))
-            viewModel.sendReport(email, "My description")
+            assertEquals(awaitItem(), ReportProblemUiState(null, "", ""))
+            viewModel.updateEmail(email)
+            awaitItem()
+            viewModel.updateDescription(description)
+            awaitItem()
+
+            viewModel.sendReport(email, description)
 
-            assertEquals(awaitItem(), ReportProblemUiState(false, SendingReportUiState.Sending))
             assertEquals(
-                awaitItem(),
-                ReportProblemUiState(false, SendingReportUiState.Success(email))
+                ReportProblemUiState(
+                    SendingReportUiState.Sending,
+                    email,
+                    description,
+                ),
+                awaitItem()
+            )
+            assertEquals(
+                ReportProblemUiState(
+                    SendingReportUiState.Success(email),
+                    email,
+                    description,
+                ),
+                awaitItem()
             )
         }
     }
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt
index 5409b7f736ac..e2bf08300577 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt
@@ -204,6 +204,7 @@ class SplitTunnelingViewModelTest {
             SplitTunnelingViewModel(
                 mockedApplicationsProvider,
                 mockedServiceConnectionManager,
+                applicationsIconManager = mockk(),
                 testCoroutineRule.testDispatcher
             )
     }
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt
index f8736eb823ea..0ac13777cd84 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt
@@ -9,15 +9,11 @@ import io.mockk.unmockkAll
 import io.mockk.verify
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
-import kotlin.test.assertTrue
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
-import net.mullvad.mullvadvpn.compose.state.VpnSettingsDialog
-import net.mullvad.mullvadvpn.compose.state.VpnSettingsUiState
 import net.mullvad.mullvadvpn.lib.common.test.TestCoroutineRule
-import net.mullvad.mullvadvpn.lib.common.test.assertLists
 import net.mullvad.mullvadvpn.model.Constraint
 import net.mullvad.mullvadvpn.model.Port
 import net.mullvad.mullvadvpn.model.PortRange
@@ -31,7 +27,6 @@ import net.mullvad.mullvadvpn.model.WireguardTunnelOptions
 import net.mullvad.mullvadvpn.repository.SettingsRepository
 import net.mullvad.mullvadvpn.usecase.PortRangeUseCase
 import net.mullvad.mullvadvpn.usecase.RelayListUseCase
-import org.apache.commons.validator.routines.InetAddressValidator
 import org.junit.After
 import org.junit.Before
 import org.junit.Rule
@@ -41,7 +36,6 @@ class VpnSettingsViewModelTest {
     @get:Rule val testCoroutineRule = TestCoroutineRule()
 
     private val mockSettingsRepository: SettingsRepository = mockk()
-    private val mockInetAddressValidator: InetAddressValidator = mockk()
     private val mockResources: Resources = mockk()
     private val mockPortRangeUseCase: PortRangeUseCase = mockk()
     private val mockRelayListUseCase: RelayListUseCase = mockk()
@@ -59,7 +53,6 @@ class VpnSettingsViewModelTest {
         viewModel =
             VpnSettingsViewModel(
                 repository = mockSettingsRepository,
-                inetAddressValidator = mockInetAddressValidator,
                 resources = mockResources,
                 portRangeUseCase = mockPortRangeUseCase,
                 relayListUseCase = mockRelayListUseCase,
@@ -133,6 +126,7 @@ class VpnSettingsViewModelTest {
         viewModel.uiState.test {
             assertIs<Constraint.Any<Port>>(awaitItem().selectedWireguardPort)
             mockSettingsUpdate.value = mockSettings
+            assertEquals(expectedPort, awaitItem().customWireguardPort)
             assertEquals(expectedPort, awaitItem().selectedWireguardPort)
         }
     }
@@ -152,23 +146,4 @@ class VpnSettingsViewModelTest {
             mockRelayListUseCase.updateSelectedWireguardConstraints(wireguardConstraints)
         }
     }
-
-    @Test
-    fun test_update_port_range_state() = runTest {
-        // Arrange
-        val expectedPortRange = listOf<PortRange>(mockk(), mockk())
-        val mockSettings: Settings = mockk(relaxed = true)
-
-        every { mockSettings.relaySettings } returns mockk<RelaySettings.Normal>(relaxed = true)
-        portRangeFlow.value = expectedPortRange
-
-        // Act, Assert
-        viewModel.uiState.test {
-            assertIs<VpnSettingsUiState>(awaitItem())
-            viewModel.onWireguardPortInfoClicked()
-            val state = awaitItem()
-            assertTrue { state.dialog is VpnSettingsDialog.WireguardPortInfo }
-            assertLists(expectedPortRange, state.availablePortRanges)
-        }
-    }
 }
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt
index 57af45997b17..a77e8798cc3a 100644
--- a/android/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/android/buildSrc/src/main/kotlin/Dependencies.kt
@@ -45,6 +45,8 @@ object Dependencies {
     }
 
     object Compose {
+        const val destinations = "io.github.raamcosta.compose-destinations:core:${Versions.Compose.destinations}"
+        const val destinationsKsp = "io.github.raamcosta.compose-destinations:ksp:${Versions.Compose.destinations}"
         const val constrainLayout =
             "androidx.constraintlayout:constraintlayout-compose:${Versions.Compose.constrainLayout}"
         const val foundation =
@@ -130,5 +132,6 @@ object Dependencies {
         const val dependencyCheckId = "org.owasp.dependencycheck"
         const val gradleVersionsId = "com.github.ben-manes.versions"
         const val ktfmtId = "com.ncorti.ktfmt.gradle"
+        const val ksp = "com.google.devtools.ksp"
     }
 }
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 4ceb4f787f52..9ab76de3d39e 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -14,10 +14,10 @@ object Versions {
     const val billingClient = "6.0.1"
 
     object Android {
-        const val compileSdkVersion = 33
+        const val compileSdkVersion = 34
         const val material = "1.9.0"
         const val minSdkVersion = 26
-        const val targetSdkVersion = 33
+        const val targetSdkVersion = 34
         const val volley = "1.2.1"
     }
 
@@ -39,6 +39,7 @@ object Versions {
     }
 
     object Compose {
+        const val destinations = "1.9.54"
         const val base = "1.5.1"
         const val constrainLayout = "1.0.1"
         const val foundation = base
@@ -48,6 +49,7 @@ object Versions {
     }
 
     object Plugin {
+
         // The androidAapt plugin version must be in sync with the android plugin version.
         // Required for Gradle metadata verification to work properly, see:
         // https://github.com/gradle/gradle/issues/19228
@@ -57,6 +59,9 @@ object Versions {
         const val dependencyCheck = "8.3.1"
         const val gradleVersions = "0.47.0"
         const val ktfmt = "0.13.0"
+        // Ksp version is linked with kotlin version, find matching release here:
+        // https://github.com/google/ksp/releases
+        const val ksp = "${kotlin}-1.0.13"
     }
 
     object Koin {
diff --git a/android/config/dependency-check-suppression.xml b/android/config/dependency-check-suppression.xml
index 57e19a9d54b1..d2bb95dc9a85 100644
--- a/android/config/dependency-check-suppression.xml
+++ b/android/config/dependency-check-suppression.xml
@@ -51,4 +51,13 @@
         <packageUrl regex="true">^pkg:maven/com\.squareup\.okio/okio@.*$</packageUrl>
         <cve>CVE-2023-3635</cve>
     </suppress>
+    <suppress>
+        <notes><![CDATA[
+          This CVE only affect programs using loadXML and is derived from using ksp.
+          We do not use the loadXML, ksp is used to generate navigation paths in our code
+          and not for processesing any user input.
+        ]]></notes>
+        <packageUrl regex="true">^pkg:maven/com\.google\.devtools\.ksp/symbol\-processing.*@.*$</packageUrl>
+        <cve>CVE-2018-1000840</cve>
+    </suppress>
 </suppressions>
diff --git a/android/docs/diagrams/nav_graph.dot b/android/docs/diagrams/nav_graph.dot
new file mode 100644
index 000000000000..7925bb533d52
--- /dev/null
+++ b/android/docs/diagrams/nav_graph.dot
@@ -0,0 +1,48 @@
+digraph {
+    {
+        node [shape=rectangle]
+        splash [label="Splash"]
+        login [label="Login"]
+        connect [label="Connect"]
+        too_many_devices [label="Too many devices"]
+        welcome [label="Welcome"]
+        revoked [label="Revoked"]
+        privacy_policy [label="Privacy policy"]
+        account [label="Account"]
+        settings [label = "Settings"]
+        report_problem [label = "Report problem"]
+        view_logs [label = "View logs"]
+        split_tunneling [label = "Split tunneling"]
+        vpn_settings [label = "VPN settings"]
+        switch_location [label = "Switch location"]
+    }
+
+    splash -> privacy_policy
+    splash -> login
+    splash -> connect
+    splash -> revoked
+
+
+    revoked -> login
+    privacy_policy -> login
+
+    login -> welcome
+    login -> too_many_devices
+    login -> settings
+    login -> connect
+
+    too_many_devices -> login
+
+    welcome -> connect
+
+    connect -> revoked
+    connect -> settings
+    connect -> account
+    connect -> switch_location
+
+    settings -> vpn_settings
+    settings -> split_tunneling
+    settings -> report_problem
+
+    report_problem -> view_logs
+}
diff --git a/android/docs/diagrams/nav_graph.svg b/android/docs/diagrams/nav_graph.svg
new file mode 100644
index 000000000000..f223a1f6bde5
--- /dev/null
+++ b/android/docs/diagrams/nav_graph.svg
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 9.0.0 (20230911.1827)
+ -->
+<!-- Pages: 1 -->
+<svg width="497pt" height="548pt"
+ viewBox="0.00 0.00 497.00 548.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 544)">
+<polygon fill="white" stroke="none" points="-4,4 -4,-544 493,-544 493,4 -4,4"/>
+<!-- splash -->
+<g id="node1" class="node">
+<title>splash</title>
+<polygon fill="none" stroke="black" points="163,-540 109,-540 109,-504 163,-504 163,-540"/>
+<text text-anchor="middle" x="136" y="-516.95" font-family="Times,serif" font-size="14.00">Splash</text>
+</g>
+<!-- login -->
+<g id="node2" class="node">
+<title>login</title>
+<polygon fill="none" stroke="black" points="176,-396 122,-396 122,-360 176,-360 176,-396"/>
+<text text-anchor="middle" x="149" y="-372.95" font-family="Times,serif" font-size="14.00">Login</text>
+</g>
+<!-- splash&#45;&gt;login -->
+<g id="edge2" class="edge">
+<title>splash&#45;&gt;login</title>
+<path fill="none" stroke="black" d="M143.89,-503.75C148.11,-493.58 152.86,-480.33 155,-468 158.49,-447.92 156.81,-424.96 154.34,-407.39"/>
+<polygon fill="black" stroke="black" points="157.83,-407.01 152.81,-397.68 150.91,-408.11 157.83,-407.01"/>
+</g>
+<!-- connect -->
+<g id="node3" class="node">
+<title>connect</title>
+<polygon fill="none" stroke="black" points="267.5,-252 206.5,-252 206.5,-216 267.5,-216 267.5,-252"/>
+<text text-anchor="middle" x="237" y="-228.95" font-family="Times,serif" font-size="14.00">Connect</text>
+</g>
+<!-- splash&#45;&gt;connect -->
+<g id="edge3" class="edge">
+<title>splash&#45;&gt;connect</title>
+<path fill="none" stroke="black" d="M157.16,-503.65C193.5,-472.3 266.52,-402.17 294,-324 299.31,-308.91 300.39,-302.67 294,-288 289.3,-277.22 281.22,-267.65 272.59,-259.71"/>
+<polygon fill="black" stroke="black" points="274.92,-257.1 265.03,-253.3 270.4,-262.44 274.92,-257.1"/>
+</g>
+<!-- revoked -->
+<g id="node6" class="node">
+<title>revoked</title>
+<polygon fill="none" stroke="black" points="70,-180 6,-180 6,-144 70,-144 70,-180"/>
+<text text-anchor="middle" x="38" y="-156.95" font-family="Times,serif" font-size="14.00">Revoked</text>
+</g>
+<!-- splash&#45;&gt;revoked -->
+<g id="edge4" class="edge">
+<title>splash&#45;&gt;revoked</title>
+<path fill="none" stroke="black" d="M108.66,-510.67C88.41,-501.88 61.27,-487.55 43,-468 13.01,-435.9 0,-422.93 0,-379 0,-379 0,-379 0,-305 0,-264.18 14.84,-218.93 25.97,-190.72"/>
+<polygon fill="black" stroke="black" points="29.2,-192.08 29.74,-181.49 22.72,-189.43 29.2,-192.08"/>
+</g>
+<!-- privacy_policy -->
+<g id="node7" class="node">
+<title>privacy_policy</title>
+<polygon fill="none" stroke="black" points="146.38,-468 51.62,-468 51.62,-432 146.38,-432 146.38,-468"/>
+<text text-anchor="middle" x="99" y="-444.95" font-family="Times,serif" font-size="14.00">Privacy policy</text>
+</g>
+<!-- splash&#45;&gt;privacy_policy -->
+<g id="edge1" class="edge">
+<title>splash&#45;&gt;privacy_policy</title>
+<path fill="none" stroke="black" d="M126.85,-503.7C122.78,-495.98 117.88,-486.71 113.33,-478.11"/>
+<polygon fill="black" stroke="black" points="116.52,-476.65 108.75,-469.44 110.33,-479.92 116.52,-476.65"/>
+</g>
+<!-- login&#45;&gt;connect -->
+<g id="edge10" class="edge">
+<title>login&#45;&gt;connect</title>
+<path fill="none" stroke="black" d="M176.5,-374.46C207.16,-369.98 255.42,-357.69 278,-324 291.35,-304.08 277.57,-279.12 262.49,-260.71"/>
+<polygon fill="black" stroke="black" points="265.31,-258.61 256.09,-253.38 260.04,-263.22 265.31,-258.61"/>
+</g>
+<!-- too_many_devices -->
+<g id="node4" class="node">
+<title>too_many_devices</title>
+<polygon fill="none" stroke="black" points="182.25,-324 65.75,-324 65.75,-288 182.25,-288 182.25,-324"/>
+<text text-anchor="middle" x="124" y="-300.95" font-family="Times,serif" font-size="14.00">Too many devices</text>
+</g>
+<!-- login&#45;&gt;too_many_devices -->
+<g id="edge8" class="edge">
+<title>login&#45;&gt;too_many_devices</title>
+<path fill="none" stroke="black" d="M136.9,-359.7C133.47,-352.24 130.05,-343.32 127.36,-334.97"/>
+<polygon fill="black" stroke="black" points="130.78,-334.19 124.63,-325.56 124.06,-336.14 130.78,-334.19"/>
+</g>
+<!-- welcome -->
+<g id="node5" class="node">
+<title>welcome</title>
+<polygon fill="none" stroke="black" points="269.25,-324 200.75,-324 200.75,-288 269.25,-288 269.25,-324"/>
+<text text-anchor="middle" x="235" y="-300.95" font-family="Times,serif" font-size="14.00">Welcome</text>
+</g>
+<!-- login&#45;&gt;welcome -->
+<g id="edge7" class="edge">
+<title>login&#45;&gt;welcome</title>
+<path fill="none" stroke="black" d="M170.26,-359.7C180.7,-351.2 193.46,-340.81 204.88,-331.51"/>
+<polygon fill="black" stroke="black" points="206.97,-334.33 212.51,-325.3 202.55,-328.9 206.97,-334.33"/>
+</g>
+<!-- settings -->
+<g id="node9" class="node">
+<title>settings</title>
+<polygon fill="none" stroke="black" points="364.75,-180 305.25,-180 305.25,-144 364.75,-144 364.75,-180"/>
+<text text-anchor="middle" x="335" y="-156.95" font-family="Times,serif" font-size="14.00">Settings</text>
+</g>
+<!-- login&#45;&gt;settings -->
+<g id="edge9" class="edge">
+<title>login&#45;&gt;settings</title>
+<path fill="none" stroke="black" d="M176.47,-374.56C209.21,-370.16 263.36,-357.9 294,-324 327.21,-287.25 334.32,-227.34 335.39,-191.89"/>
+<polygon fill="black" stroke="black" points="338.89,-192.01 335.53,-181.97 331.89,-191.91 338.89,-192.01"/>
+</g>
+<!-- connect&#45;&gt;revoked -->
+<g id="edge13" class="edge">
+<title>connect&#45;&gt;revoked</title>
+<path fill="none" stroke="black" d="M206.34,-222.22C172.8,-210.42 118.79,-191.42 81.02,-178.13"/>
+<polygon fill="black" stroke="black" points="82.37,-174.9 71.77,-174.88 80.04,-181.5 82.37,-174.9"/>
+</g>
+<!-- account -->
+<g id="node8" class="node">
+<title>account</title>
+<polygon fill="none" stroke="black" points="168.88,-180 107.12,-180 107.12,-144 168.88,-144 168.88,-180"/>
+<text text-anchor="middle" x="138" y="-156.95" font-family="Times,serif" font-size="14.00">Account</text>
+</g>
+<!-- connect&#45;&gt;account -->
+<g id="edge15" class="edge">
+<title>connect&#45;&gt;account</title>
+<path fill="none" stroke="black" d="M212.27,-215.52C200.01,-206.85 185.02,-196.25 171.73,-186.85"/>
+<polygon fill="black" stroke="black" points="173.83,-184.05 163.65,-181.13 169.79,-189.77 173.83,-184.05"/>
+</g>
+<!-- connect&#45;&gt;settings -->
+<g id="edge14" class="edge">
+<title>connect&#45;&gt;settings</title>
+<path fill="none" stroke="black" d="M261.48,-215.52C273.61,-206.85 288.45,-196.25 301.61,-186.85"/>
+<polygon fill="black" stroke="black" points="303.5,-189.8 309.6,-181.14 299.43,-184.1 303.5,-189.8"/>
+</g>
+<!-- switch_location -->
+<g id="node14" class="node">
+<title>switch_location</title>
+<polygon fill="none" stroke="black" points="287.38,-180 186.62,-180 186.62,-144 287.38,-144 287.38,-180"/>
+<text text-anchor="middle" x="237" y="-156.95" font-family="Times,serif" font-size="14.00">Switch location</text>
+</g>
+<!-- connect&#45;&gt;switch_location -->
+<g id="edge16" class="edge">
+<title>connect&#45;&gt;switch_location</title>
+<path fill="none" stroke="black" d="M237,-215.7C237,-208.41 237,-199.73 237,-191.54"/>
+<polygon fill="black" stroke="black" points="240.5,-191.62 237,-181.62 233.5,-191.62 240.5,-191.62"/>
+</g>
+<!-- too_many_devices&#45;&gt;login -->
+<g id="edge11" class="edge">
+<title>too_many_devices&#45;&gt;login</title>
+<path fill="none" stroke="black" d="M136,-324.1C139.44,-331.54 142.87,-340.44 145.57,-348.81"/>
+<polygon fill="black" stroke="black" points="142.16,-349.62 148.31,-358.24 148.88,-347.66 142.16,-349.62"/>
+</g>
+<!-- welcome&#45;&gt;connect -->
+<g id="edge12" class="edge">
+<title>welcome&#45;&gt;connect</title>
+<path fill="none" stroke="black" d="M235.49,-287.7C235.7,-280.41 235.95,-271.73 236.18,-263.54"/>
+<polygon fill="black" stroke="black" points="239.68,-263.71 236.47,-253.62 232.68,-263.51 239.68,-263.71"/>
+</g>
+<!-- revoked&#45;&gt;login -->
+<g id="edge5" class="edge">
+<title>revoked&#45;&gt;login</title>
+<path fill="none" stroke="black" d="M35.33,-180.19C31.4,-211.59 27.41,-279.12 57,-324 69.67,-343.22 91.87,-356.3 111.29,-364.66"/>
+<polygon fill="black" stroke="black" points="109.72,-367.8 120.3,-368.26 112.32,-361.3 109.72,-367.8"/>
+</g>
+<!-- privacy_policy&#45;&gt;login -->
+<g id="edge6" class="edge">
+<title>privacy_policy&#45;&gt;login</title>
+<path fill="none" stroke="black" d="M111.36,-431.7C117.05,-423.73 123.93,-414.1 130.24,-405.26"/>
+<polygon fill="black" stroke="black" points="132.94,-407.51 135.9,-397.34 127.24,-403.44 132.94,-407.51"/>
+</g>
+<!-- report_problem -->
+<g id="node10" class="node">
+<title>report_problem</title>
+<polygon fill="none" stroke="black" points="269.12,-108 166.88,-108 166.88,-72 269.12,-72 269.12,-108"/>
+<text text-anchor="middle" x="218" y="-84.95" font-family="Times,serif" font-size="14.00">Report problem</text>
+</g>
+<!-- settings&#45;&gt;report_problem -->
+<g id="edge19" class="edge">
+<title>settings&#45;&gt;report_problem</title>
+<path fill="none" stroke="black" d="M305.78,-143.52C290.87,-134.6 272.54,-123.63 256.49,-114.03"/>
+<polygon fill="black" stroke="black" points="258.53,-111.17 248.15,-109.04 254.93,-117.18 258.53,-111.17"/>
+</g>
+<!-- split_tunneling -->
+<g id="node12" class="node">
+<title>split_tunneling</title>
+<polygon fill="none" stroke="black" points="383.12,-108 286.88,-108 286.88,-72 383.12,-72 383.12,-108"/>
+<text text-anchor="middle" x="335" y="-84.95" font-family="Times,serif" font-size="14.00">Split tunneling</text>
+</g>
+<!-- settings&#45;&gt;split_tunneling -->
+<g id="edge18" class="edge">
+<title>settings&#45;&gt;split_tunneling</title>
+<path fill="none" stroke="black" d="M335,-143.7C335,-136.41 335,-127.73 335,-119.54"/>
+<polygon fill="black" stroke="black" points="338.5,-119.62 335,-109.62 331.5,-119.62 338.5,-119.62"/>
+</g>
+<!-- vpn_settings -->
+<g id="node13" class="node">
+<title>vpn_settings</title>
+<polygon fill="none" stroke="black" points="489,-108 401,-108 401,-72 489,-72 489,-108"/>
+<text text-anchor="middle" x="445" y="-84.95" font-family="Times,serif" font-size="14.00">VPN settings</text>
+</g>
+<!-- settings&#45;&gt;vpn_settings -->
+<g id="edge17" class="edge">
+<title>settings&#45;&gt;vpn_settings</title>
+<path fill="none" stroke="black" d="M362.47,-143.52C376.36,-134.68 393.4,-123.84 408.38,-114.3"/>
+<polygon fill="black" stroke="black" points="410.04,-117.39 416.6,-109.07 406.28,-111.49 410.04,-117.39"/>
+</g>
+<!-- view_logs -->
+<g id="node11" class="node">
+<title>view_logs</title>
+<polygon fill="none" stroke="black" points="253.75,-36 182.25,-36 182.25,0 253.75,0 253.75,-36"/>
+<text text-anchor="middle" x="218" y="-12.95" font-family="Times,serif" font-size="14.00">View logs</text>
+</g>
+<!-- report_problem&#45;&gt;view_logs -->
+<g id="edge20" class="edge">
+<title>report_problem&#45;&gt;view_logs</title>
+<path fill="none" stroke="black" d="M218,-71.7C218,-64.41 218,-55.73 218,-47.54"/>
+<polygon fill="black" stroke="black" points="221.5,-47.62 218,-37.62 214.5,-47.62 221.5,-47.62"/>
+</g>
+</g>
+</svg>
diff --git a/android/docs/diagrams/update_graph.sh b/android/docs/diagrams/update_graph.sh
new file mode 100755
index 000000000000..8b42e5a1ddb4
--- /dev/null
+++ b/android/docs/diagrams/update_graph.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+dot $SCRIPT_DIR/nav_graph.dot -Tsvg -o $SCRIPT_DIR/nav_graph.svg
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index 074e8a71a28e..7408b6545cdb 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -1023,6 +1023,14 @@
             <sha256 value="93747a9145cb36bc71005f598ede32e2b1149ade5a16e62b0e4969345bc62d85" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-common" version="2.6.2">
+         <artifact name="lifecycle-common-2.6.2.jar">
+            <sha256 value="f34831b6c71cd844e1d35d1be49d5e79447c5ab856346531b1e8676fda7374b1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-common-2.6.2.module">
+            <sha256 value="0fa7f28f5cff8a406a4f7870b243cb0d6d7a7c20faa7a2becaff5907ae12f9cc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.6.1">
          <artifact name="lifecycle-common-java8-2.6.1.jar">
             <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/>
@@ -1031,6 +1039,14 @@
             <sha256 value="1beb0b9fffb630a005deca1d3583d2acbec8685d6de809a3a6e0e433f418b6c3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-common-java8" version="2.6.2">
+         <artifact name="lifecycle-common-java8-2.6.2.jar">
+            <sha256 value="c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-common-java8-2.6.2.module">
+            <sha256 value="3d538207d68eb89aa0166edac09422b9374819506da39be62c01f0c0f6384f7e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.0.0">
          <artifact name="lifecycle-livedata-2.0.0.aar">
             <sha256 value="c82609ced8c498f0a701a30fb6771bb7480860daee84d82e0a81ee86edf7ba39" origin="Generated by Gradle"/>
@@ -1044,6 +1060,14 @@
             <sha256 value="e2659e87e890b52b66f300471828b387a205e5387a392713190166f399ecf641" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata" version="2.6.2">
+         <artifact name="lifecycle-livedata-2.6.2.aar">
+            <sha256 value="67359f609dfc2bf65da1270b23033f856064ec279f058e0a70c715f7c9003031" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-livedata-2.6.2.module">
+            <sha256 value="19a287b46d1b1ffe297bee0df7dee5183aeba95600ec0de8742adeb5b67c8bab" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.0.0">
          <artifact name="lifecycle-livedata-core-2.0.0.aar">
             <sha256 value="fde334ec7e22744c0f5bfe7caf1a84c9d717327044400577bdf9bd921ec4f7bc" origin="Generated by Gradle"/>
@@ -1070,6 +1094,14 @@
             <sha256 value="e9c0dc3f0ac54419c0cfed8ff5cecb82943a7c58f7a54169f0d849b2c60a3552" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.6.2">
+         <artifact name="lifecycle-livedata-core-2.6.2.aar">
+            <sha256 value="2256780a3cff4a1e57fbb3d442557c17dc363ab8af105bcaf5261d8e2d5db949" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-livedata-core-2.6.2.module">
+            <sha256 value="527d0e1ac467d1f47cc20ed7c30db170217299fabb868154cf5d1765e4e4dad9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.5.1">
          <artifact name="lifecycle-livedata-core-ktx-2.5.1.module">
             <sha256 value="8076fd96e862164e46b34560bf40e02ae75965a28a209e47284ccbb7b5808e8c" origin="Generated by Gradle"/>
@@ -1083,6 +1115,14 @@
             <sha256 value="d8699c515516aee3a0613de951649d9f1e137d33fedf077be0a6aa9e01ae211f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-livedata-core-ktx" version="2.6.2">
+         <artifact name="lifecycle-livedata-core-ktx-2.6.2.aar">
+            <sha256 value="9f2c16e33a55ba8d67a3623a55befff2ec80643e3f0a926760df1d957c3f8aef" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-livedata-core-ktx-2.6.2.module">
+            <sha256 value="1d6ef93736ae001c226bf2cb4b180bcb0718199a1d3868ee8846f4cc8318b779" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-process" version="2.4.1">
          <artifact name="lifecycle-process-2.4.1.aar">
             <sha256 value="db649b3efa24e31052145310b002db91da346b3f89c093ec38c3046db45e794e" origin="Generated by Gradle"/>
@@ -1099,6 +1139,14 @@
             <sha256 value="58c9e27371ccf7a22a233f44926d348c9d07e78c41a56588a4265ff6ae76645a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-process" version="2.6.2">
+         <artifact name="lifecycle-process-2.6.2.aar">
+            <sha256 value="0f33b1bd017f965a6afb2e7bf3e3bd343c624061c1986dea8ba2469d04349437" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-process-2.6.2.module">
+            <sha256 value="d927d41903a2ff02ba1b9fefa4c25cb58187b1ce3a054945f43ce6a29918a3f3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.1.0">
          <artifact name="lifecycle-runtime-2.1.0.aar">
             <sha256 value="e5173897b965e870651e83d9d5af1742d3f532d58863223a390ce3a194c8312b" origin="Generated by Gradle"/>
@@ -1130,6 +1178,14 @@
             <sha256 value="a4cbb01a42d07047bd8d870017c96a1b0b7b4673320e86b66317a13be2ec10c7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.6.2">
+         <artifact name="lifecycle-runtime-2.6.2.aar">
+            <sha256 value="4867fd5279742fba8388821930cb2affe06d81a52814e7e41e70392ea0ef887c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-runtime-2.6.2.module">
+            <sha256 value="ea0131846abe1fe9dea59ac6dfe1f0fb9d8b6d600c9eff9a1fd4ad5ee5e7cbc7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.5.1">
          <artifact name="lifecycle-runtime-ktx-2.5.1.module">
             <sha256 value="488d174a07733b1cff27ddf426097f4e3fe71ed34c6a0000b56424f8d06c51fd" origin="Generated by Gradle"/>
@@ -1143,6 +1199,14 @@
             <sha256 value="39854f32c9b010f652f4e5041ca4ce06981dcb6954128c1e8e1cc02e63ab185f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.6.2">
+         <artifact name="lifecycle-runtime-ktx-2.6.2.aar">
+            <sha256 value="28a0b834f40edd52e2f8010bdc3057d2a0cc76aaa5ac9311adb0b9ce919ca9cc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-runtime-ktx-2.6.2.module">
+            <sha256 value="3c9af03a3a543394e67ab599b727ba331e6f330a55829f6d52f63a8772f4cbdc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.1.0">
          <artifact name="lifecycle-viewmodel-2.1.0.aar">
             <sha256 value="ba55fb7ac1b2828d5327cda8acf7085d990b2b4c43ef336caa67686249b8523d" origin="Generated by Gradle"/>
@@ -1174,14 +1238,27 @@
             <sha256 value="2b406faea5c12f2b8df4b7a60931f846648f2e1f4d78361e198d1184f19a4797" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose" version="2.6.1">
-         <artifact name="lifecycle-viewmodel-compose-2.6.1.aar">
-            <sha256 value="c2b820204c2ca58ef9cb015a3e5ffbe88d8c55b09e5cb851d62b445528a379e0" origin="Generated by Gradle"/>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.6.2">
+         <artifact name="lifecycle-viewmodel-2.6.2.aar">
+            <sha256 value="e4ff4338999e1c6c9c724719f5d4aa7dd61bf6f545d5256a27a9d375df9f2330" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="lifecycle-viewmodel-2.6.2.module">
+            <sha256 value="74e9a9ea46842a25642c91de2190ac24dcc1ea017395aae0eb250057d32699c6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose" version="2.6.1">
          <artifact name="lifecycle-viewmodel-compose-2.6.1.module">
             <sha256 value="e35ad4a1442bee1fc556f352bcf6830a959682d1e4fc0b2cdc3c017aa003cf99" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-compose" version="2.6.2">
+         <artifact name="lifecycle-viewmodel-compose-2.6.2.aar">
+            <sha256 value="c2b820204c2ca58ef9cb015a3e5ffbe88d8c55b09e5cb851d62b445528a379e0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-viewmodel-compose-2.6.2.module">
+            <sha256 value="55ba297e2fc68b1f9f673fbf9c2173e8deddf5aea23d9136f228eaa5fac57428" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.6.1">
          <artifact name="lifecycle-viewmodel-ktx-2.6.1.aar">
             <sha256 value="7fc0fa234a3321b1f34db5862b17da83d1c62c1bc66ec2fd4f1bb0a771acfabb" origin="Generated by Gradle"/>
@@ -1190,6 +1267,14 @@
             <sha256 value="a5110f85788bc167df9fe8fbe08004ddc5c5dd9b15cb7376ceeaef025fccaaf8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-ktx" version="2.6.2">
+         <artifact name="lifecycle-viewmodel-ktx-2.6.2.aar">
+            <sha256 value="7fc0fa234a3321b1f34db5862b17da83d1c62c1bc66ec2fd4f1bb0a771acfabb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-viewmodel-ktx-2.6.2.module">
+            <sha256 value="16d314c6ec774cf83216c46e6e7fa96c615e1d2611995d368389154b57741861" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.3.0">
          <artifact name="lifecycle-viewmodel-savedstate-2.3.0.module">
             <sha256 value="aaebeb10e23b2ca35346e767aead804254a9889623873fc5cab2041dc931ad9c" origin="Generated by Gradle"/>
@@ -1216,6 +1301,14 @@
             <sha256 value="dafb8649763d29c29cda27bc22fcdab9a9efc53c0fff9ae3de90882eabaa8944" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.6.2">
+         <artifact name="lifecycle-viewmodel-savedstate-2.6.2.aar">
+            <sha256 value="7bc7dcbab17636ec076f12afe4d02671265c389457b1b366b37a0e8cb91e2da0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="lifecycle-viewmodel-savedstate-2.6.2.module">
+            <sha256 value="79f9d92880c2fb7827ac6739eb747264245ae456f4c21f77cf39fdb6a50a76ae" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.loader" name="loader" version="1.0.0">
          <artifact name="loader-1.0.0.aar">
             <sha256 value="11f735cb3b55c458d470bed9e25254375b518b4b1bad6926783a7026db0f5025" origin="Generated by Gradle"/>
@@ -1226,6 +1319,46 @@
             <sha256 value="e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.navigation" name="navigation-common" version="2.7.3">
+         <artifact name="navigation-common-2.7.3.aar">
+            <sha256 value="cbd3fa52c33ce127eb8831773bfbc896960ad7679e2a815b00ff0eadf625056c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="navigation-common-2.7.3.module">
+            <sha256 value="5b272ee0022f2ea130d26a5c6de44a282f5386adf7d6628a9e0fae4c58c11b15" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation" name="navigation-common-ktx" version="2.7.3">
+         <artifact name="navigation-common-ktx-2.7.3.aar">
+            <sha256 value="3219679a6bbaf106599c2ad008e57aa329c02b1ecba4269f48a3f85efab607ea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="navigation-common-ktx-2.7.3.module">
+            <sha256 value="99dd6dee24cf0cbf57e1efda81e66cf14902e275d6f9af3e1fe2e29bf776f407" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation" name="navigation-compose" version="2.7.3">
+         <artifact name="navigation-compose-2.7.3.aar">
+            <sha256 value="57fe70da400372b966d4898ecab06870f14efae748920493d5ad91f130936725" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="navigation-compose-2.7.3.module">
+            <sha256 value="22f1077d4cb19728789e1fe180fe7da4666020f4ffc58db75667329a3382e055" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation" name="navigation-runtime" version="2.7.3">
+         <artifact name="navigation-runtime-2.7.3.aar">
+            <sha256 value="cfa0369c917f7b2779c8b2492a6ee6000eb5b5dfdc155146113e57ea030a73b3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="navigation-runtime-2.7.3.module">
+            <sha256 value="f15c60c42d82f3333fb30bda16dec6d7bf04d64e16832996cc92e2d16280c082" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.navigation" name="navigation-runtime-ktx" version="2.7.3">
+         <artifact name="navigation-runtime-ktx-2.7.3.aar">
+            <sha256 value="6d3259fd2701f970fdb39b8f1f0001c05ca83f6c908e1b95ed5eaddf82e5ece0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="navigation-runtime-ktx-2.7.3.module">
+            <sha256 value="9a07296f688f2a7aa7c7a412fdc3eebd055eeab89d33d25059c05ffd0a5d48b7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.print" name="print" version="1.0.0">
          <artifact name="print-1.0.0.aar">
             <sha256 value="1d5c7f3135a1bba661fc373fd72e11eb0a4adbb3396787826dd8e4190d5d9edd" origin="Generated by Gradle"/>
@@ -2072,6 +2205,32 @@
             <sha256 value="f1dd23f8ae34a8e91366723991ead0d6499d1a3e9163ce550c200b02d76a872b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing" version="1.9.10-1.0.13">
+         <artifact name="symbol-processing-1.9.10-1.0.13.jar">
+            <sha256 value="b5c210019cdc64a3c22095e79b4a9536e395e11b72941478e63b2c0aa2040fe4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="1.9.10-1.0.13">
+         <artifact name="symbol-processing-api-1.9.10-1.0.13.jar">
+            <sha256 value="1c77f6f3f0cbe1ba78b78d75fc06ffcdc2f7fcf13b2a40743d30a154e473643a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-api-1.9.10-1.0.13.module">
+            <sha256 value="56686a7927367776f82a3f01970dac7fa95807b964f59e0d72993c214ab14edc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="1.9.10-1.0.13">
+         <artifact name="symbol-processing-cmdline-1.9.10-1.0.13.jar">
+            <sha256 value="e53017cc5005df3a32d122ff2178a9e1e7fe957c2dc5e336c11a96faa55b19f6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-gradle-plugin" version="1.9.10-1.0.13">
+         <artifact name="symbol-processing-gradle-plugin-1.9.10-1.0.13.jar">
+            <sha256 value="f8a2c5bcd84a6a15a02110d799ec896789a54ec3d141d77a8398c684e9c5c5ae" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-gradle-plugin-1.9.10-1.0.13.module">
+            <sha256 value="dbeddf9afd0bf1a3ad5e2aa427b25b9d07aa7dd762f94e5200d7420ec9afe3e3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.11.0">
          <artifact name="error_prone_annotations-2.11.0.jar">
             <sha256 value="721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec" origin="Generated by Gradle"/>
@@ -2552,6 +2711,30 @@
             <sha256 value="9990a2039778f6b4cc94790141c2868864eacee0620c6c459451121a901cd5b5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.raamcosta.compose-destinations" name="codegen" version="1.9.54">
+         <artifact name="codegen-1.9.54.jar">
+            <sha256 value="8f043c861c5403720719f0e86f18252232828ccdd74db464159b5238de1c1921" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="codegen-1.9.54.module">
+            <sha256 value="c4be8332e868d24a1d270b43d48a08688a24e50ad6a7b33e0dff6bdc11802fbc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.github.raamcosta.compose-destinations" name="core" version="1.9.54">
+         <artifact name="core-1.9.54.aar">
+            <sha256 value="08dd15a1cbd13105318b6fa9e742cd9e9044d88eaa55a58fc55e502690754e5e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-1.9.54.module">
+            <sha256 value="a718c2c030c8f307343edca88fa9b5fe56a16ae894839f6d1aba2bbff1efe22c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.github.raamcosta.compose-destinations" name="ksp" version="1.9.54">
+         <artifact name="ksp-1.9.54.jar">
+            <sha256 value="1ef2302b3ac16570b321e1b8d059bd3f491c9244f2d87f2c1d8be9f1f0c2fa3a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ksp-1.9.54.module">
+            <sha256 value="f761edcd1fd3d50d1b312aaf44f7d84ebbd1244265064d6d623e2904e62f3a45" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.github.x-stream" name="mxparser" version="1.2.2">
          <artifact name="mxparser-1.2.2.jar">
             <sha256 value="aeeee23a3303d811bca8790ea7f25b534314861c03cff36dafdcc2180969eb97" origin="Generated by Gradle"/>
diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt
index 37447483c2e1..eeaa395b6928 100644
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt
+++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt
@@ -2,16 +2,21 @@ package net.mullvad.mullvadvpn.lib.common.util
 
 import android.Manifest
 import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT
 import android.content.Context
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
 import android.service.quicksettings.Tile
-import android.widget.Toast
 
 object SdkUtils {
+    // TODO Rework how pending intents work
     fun getSupportedPendingIntentFlags(): Int {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            PendingIntent.FLAG_UPDATE_CURRENT or
+                PendingIntent.FLAG_MUTABLE or
+                FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
         } else {
             PendingIntent.FLAG_UPDATE_CURRENT
@@ -36,10 +41,4 @@ object SdkUtils {
         } else {
             @Suppress("DEPRECATION") getInstalledPackages(flags)
         }
-
-    fun showCopyToastIfNeeded(context: Context, message: String) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
-        }
-    }
 }
diff --git a/android/lib/resource/src/main/res/anim/do_nothing.xml b/android/lib/resource/src/main/res/anim/do_nothing.xml
deleted file mode 100644
index 8cb6866d6db7..000000000000
--- a/android/lib/resource/src/main/res/anim/do_nothing.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="0"
-               android:toYDelta="0"
-               android:duration="@integer/transition_animation_duration" />
-</set>
diff --git a/android/lib/resource/src/main/res/anim/fragment_enter_from_bottom.xml b/android/lib/resource/src/main/res/anim/fragment_enter_from_bottom.xml
deleted file mode 100644
index 337392e881b4..000000000000
--- a/android/lib/resource/src/main/res/anim/fragment_enter_from_bottom.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="100%p"
-               android:toYDelta="0"
-               android:duration="@integer/transition_animation_duration" />
-</set>
diff --git a/android/lib/resource/src/main/res/anim/fragment_enter_from_right.xml b/android/lib/resource/src/main/res/anim/fragment_enter_from_right.xml
deleted file mode 100644
index 5ba3b5c3f8f6..000000000000
--- a/android/lib/resource/src/main/res/anim/fragment_enter_from_right.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="100%p"
-               android:toXDelta="0"
-               android:duration="@integer/transition_animation_duration" />
-</set>
diff --git a/android/lib/resource/src/main/res/anim/fragment_exit_to_bottom.xml b/android/lib/resource/src/main/res/anim/fragment_exit_to_bottom.xml
deleted file mode 100644
index dc1261114ae4..000000000000
--- a/android/lib/resource/src/main/res/anim/fragment_exit_to_bottom.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="0"
-               android:toYDelta="100%p"
-               android:duration="@integer/transition_animation_duration" />
-</set>
diff --git a/android/lib/resource/src/main/res/anim/fragment_exit_to_left.xml b/android/lib/resource/src/main/res/anim/fragment_exit_to_left.xml
deleted file mode 100644
index 9ffa2c987758..000000000000
--- a/android/lib/resource/src/main/res/anim/fragment_exit_to_left.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="0%p"
-               android:toXDelta="-100%p"
-               android:duration="@integer/transition_animation_duration" />
-</set>
diff --git a/android/lib/resource/src/main/res/anim/fragment_exit_to_right.xml b/android/lib/resource/src/main/res/anim/fragment_exit_to_right.xml
deleted file mode 100644
index d79420098292..000000000000
--- a/android/lib/resource/src/main/res/anim/fragment_exit_to_right.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="0"
-               android:toXDelta="100%p"
-               android:duration="@integer/transition_animation_duration" />
-</set>
diff --git a/android/lib/resource/src/main/res/anim/fragment_half_enter_from_left.xml b/android/lib/resource/src/main/res/anim/fragment_half_enter_from_left.xml
deleted file mode 100644
index 67e7b7364e37..000000000000
--- a/android/lib/resource/src/main/res/anim/fragment_half_enter_from_left.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="-50%p"
-               android:toXDelta="0"
-               android:duration="@integer/transition_animation_duration" />
-</set>
diff --git a/android/lib/resource/src/main/res/anim/fragment_half_exit_to_left.xml b/android/lib/resource/src/main/res/anim/fragment_half_exit_to_left.xml
deleted file mode 100644
index bfac81df2ecf..000000000000
--- a/android/lib/resource/src/main/res/anim/fragment_half_exit_to_left.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="0%p"
-               android:toXDelta="-50%p"
-               android:duration="@integer/transition_animation_duration" />
-</set>
diff --git a/android/lib/resource/src/main/res/drawable/icon_fail.xml b/android/lib/resource/src/main/res/drawable/icon_fail.xml
index 1bb4906a3368..3f934a13003c 100644
--- a/android/lib/resource/src/main/res/drawable/icon_fail.xml
+++ b/android/lib/resource/src/main/res/drawable/icon_fail.xml
@@ -1,12 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="44dp"
-    android:height="44dp"
-    android:viewportWidth="44"
-    android:viewportHeight="44">
-  <path
-      android:pathData="M22,22m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0"
-      android:fillColor="#fff"/>
-  <path
-      android:pathData="m25.147,22 l7.875,-7.872A2.225,2.225 0,0 0,29.875 10.982l-7.875,7.872L14.125,10.982A2.225,2.225 0,0 0,10.977 14.128l7.875,7.872 -7.875,7.871a2.225,2.225 0,0 0,3.147 3.146l7.875,-7.872 7.875,7.872a2.225,2.225 0,0 0,3.147 -3.146l-7.875,-7.872z"
-      android:fillColor="#e34039"/>
+        android:width="44dp"
+        android:height="44dp"
+        android:viewportWidth="44"
+        android:viewportHeight="44">
+    <path android:pathData="M22,22m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0"
+          android:fillColor="#fff" />
+    <path android:pathData="m25.147,22 l7.875,-7.872A2.225,2.225 0,0 0,29.875 10.982l-7.875,7.872L14.125,10.982A2.225,2.225 0,0 0,10.977 14.128l7.875,7.872 -7.875,7.871a2.225,2.225 0,0 0,3.147 3.146l7.875,-7.872 7.875,7.872a2.225,2.225 0,0 0,3.147 -3.146l-7.875,-7.872z"
+          android:fillColor="#e34039" />
 </vector>
diff --git a/android/lib/resource/src/main/res/drawable/icon_success.xml b/android/lib/resource/src/main/res/drawable/icon_success.xml
index fc8627e9b6a0..1b15d4c1c4a0 100644
--- a/android/lib/resource/src/main/res/drawable/icon_success.xml
+++ b/android/lib/resource/src/main/res/drawable/icon_success.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="44dp"
-    android:height="44dp"
-    android:viewportWidth="44.0"
-    android:viewportHeight="44.0">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M22,22m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
-    <path
-        android:fillColor="#44AD4D"
-        android:pathData="M11.4142136,20.5857864 C10.633165,19.8047379 9.366835,19.8047379 8.5857864,20.5857864 C7.8047379,21.366835 7.8047379,22.633165 8.5857864,23.4142136 L16.5857864,31.4142136 C17.366835,32.1952621 18.633165,32.1952621 19.4142136,31.4142136 L35.4142136,15.4142136 C36.1952621,14.633165 36.1952621,13.366835 35.4142136,12.5857864 C34.633165,11.8047379 33.366835,11.8047379 32.5857864,12.5857864 L18,27.1715729 L11.4142136,20.5857864 Z" />
+        android:width="44dp"
+        android:height="44dp"
+        android:viewportWidth="44.0"
+        android:viewportHeight="44.0">
+    <path android:fillColor="#fff"
+          android:pathData="M22,22m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
+    <path android:fillColor="#44AD4D"
+          android:pathData="M11.4142136,20.5857864 C10.633165,19.8047379 9.366835,19.8047379 8.5857864,20.5857864 C7.8047379,21.366835 7.8047379,22.633165 8.5857864,23.4142136 L16.5857864,31.4142136 C17.366835,32.1952621 18.633165,32.1952621 19.4142136,31.4142136 L35.4142136,15.4142136 C36.1952621,14.633165 36.1952621,13.366835 35.4142136,12.5857864 C34.633165,11.8047379 33.366835,11.8047379 32.5857864,12.5857864 L18,27.1715729 L11.4142136,20.5857864 Z" />
 </vector>
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index f3b0b0d157fa..9849eb1c275e 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -158,7 +158,9 @@
     <string name="vpn_permission_error_notification_title">VPN permission error</string>
     <string name="vpn_permission_error_notification_message">Always-on VPN might be enabled for another app</string>
     <string name="new_device_notification_title">NEW DEVICE CREATED</string>
-    <string name="new_device_notification_message"><![CDATA[Welcome, this device is now called <b>%s</b>. For more details see the info button in Account.]]></string>
+    <string name="new_device_notification_message">
+        <![CDATA[Welcome, this device is now called <b>%s</b>. For more details see the info button in Account.]]>
+    </string>
     <string name="agree_and_continue">Agree and continue</string>
     <string name="privacy_disclaimer_title">Privacy</string>
     <string name="privacy_disclaimer_body_first_paragraph">To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you.</string>
diff --git a/android/lib/resource/src/main/res/values/styles.xml b/android/lib/resource/src/main/res/values/styles.xml
index 69ee118cac15..bd1355dbf2b8 100644
--- a/android/lib/resource/src/main/res/values/styles.xml
+++ b/android/lib/resource/src/main/res/values/styles.xml
@@ -1,10 +1,10 @@
 <resources>
     <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="android:navigationBarColor">@color/blue</item>
-        <item name="android:statusBarColor">@color/blue</item>
         <item name="android:windowBackground">@color/blue</item>
         <item name="android:spotShadowAlpha">0</item>
         <item name="actionBarSize">48dp</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 </resources>
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
index b360613eaaed..09d5471dcd23 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
@@ -1,6 +1,8 @@
 package net.mullvad.mullvadvpn.service
 
 import android.app.Service
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED
+import android.os.Build
 import kotlin.properties.Delegates.observable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -90,10 +92,18 @@ class ForegroundNotificationManager(
         }
 
     fun showOnForeground() {
-        service.startForeground(
-            TunnelStateNotification.NOTIFICATION_ID,
-            tunnelStateNotification.build()
-        )
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            service.startForeground(
+                TunnelStateNotification.NOTIFICATION_ID,
+                tunnelStateNotification.build(),
+                FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED
+            )
+        } else {
+            service.startForeground(
+                TunnelStateNotification.NOTIFICATION_ID,
+                tunnelStateNotification.build()
+            )
+        }
 
         onForeground = true
     }
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
index c7b8992292f2..024522e94a64 100644
--- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
+++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt
@@ -69,7 +69,7 @@ class CaptureScreenshotOnFailedTestRule(private val testTag: String) : TestWatch
         if (uri != null) {
             contentResolver.openOutputStream(uri).use {
                 try {
-                    this.compress(Bitmap.CompressFormat.JPEG, 50, it)
+                    this.compress(Bitmap.CompressFormat.JPEG, 50, it!!)
                 } catch (e: IOException) {
                     Log.e(testTag, "Unable to store screenshot: ${e.message}")
                 }