diff --git a/androidApp/src/main/res/values-night/themes.xml b/androidApp/src/main/res/values-night/themes.xml
new file mode 100644
index 000000000..9df5a835f
--- /dev/null
+++ b/androidApp/src/main/res/values-night/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="NightAdjusted.Theme.Katana" parent="android:Theme.Material.NoActionBar" />
+
+    <style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
+        <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="27">false</item>
+    </style>
+</resources>
diff --git a/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/MainActivity.kt b/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/MainActivity.kt
index e37574d2c..2e65bcdf3 100644
--- a/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/MainActivity.kt
+++ b/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/MainActivity.kt
@@ -3,14 +3,14 @@ package dev.alvr.katana.ui.main
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
 
 internal class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
         setContent { KatanaApp() }
     }
 }
diff --git a/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/navigation/KatanaDestinations.kt b/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/navigation/KatanaDestinations.kt
index 9cec21da5..1eab3ad48 100644
--- a/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/navigation/KatanaDestinations.kt
+++ b/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/navigation/KatanaDestinations.kt
@@ -1,16 +1,16 @@
 package dev.alvr.katana.ui.main.navigation
 
 import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.displayCutoutPadding
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.foundation.layout.windowInsetsBottomHeight
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.contentColorFor
@@ -41,7 +41,11 @@ import dev.alvr.katana.ui.main.viewmodel.MainViewModel
 import io.sentry.compose.withSentryObservableEffect
 
 @Composable
-@OptIn(ExperimentalAnimationApi::class, ExperimentalMaterialNavigationApi::class)
+@OptIn(
+    ExperimentalAnimationApi::class,
+    ExperimentalMaterialNavigationApi::class,
+    ExperimentalLayoutApi::class,
+)
 internal fun KatanaDestinations(
     useNavRail: Boolean,
     vm: MainViewModel,
@@ -66,7 +70,6 @@ internal fun KatanaDestinations(
         scrimColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.32f),
     ) {
         Scaffold(
-            modifier = Modifier.systemBarsPadding(),
             bottomBar = {
                 if (!useNavRail) {
                     NavigationBar(
@@ -74,19 +77,17 @@ internal fun KatanaDestinations(
                         navController = navController,
                         type = NavigationBarType.Bottom,
                     )
-                } else {
-                    Spacer(
-                        Modifier
-                            .windowInsetsBottomHeight(WindowInsets.navigationBars)
-                            .fillMaxWidth(),
-                    )
                 }
             },
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
         ) { paddingValues ->
             Row(
                 modifier = Modifier
                     .fillMaxSize()
-                    .padding(paddingValues),
+                    .padding(paddingValues)
+                    .consumeWindowInsets(paddingValues)
+                    .systemBarsPadding()
+                    .displayCutoutPadding(),
             ) {
                 if (useNavRail) {
                     NavigationBar(
diff --git a/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/navigation/NavigationBar.kt b/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/navigation/NavigationBar.kt
index b685f82f7..4001f62e9 100644
--- a/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/navigation/NavigationBar.kt
+++ b/app/src/androidMain/kotlin/dev/alvr/katana/ui/main/navigation/NavigationBar.kt
@@ -6,12 +6,6 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.WindowInsetsSides
-import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.only
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
 import androidx.compose.material3.Icon
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
@@ -122,13 +116,7 @@ private fun RailNavigationBar(
     isItemSelected: (NavigationBarItem) -> Boolean,
     onClick: (NavigationBarItem) -> Unit,
 ) {
-    NavigationRail(
-        modifier = Modifier.padding(
-            WindowInsets.systemBars
-                .only(WindowInsetsSides.Start + WindowInsetsSides.Vertical)
-                .asPaddingValues(),
-        ),
-    ) {
+    NavigationRail {
         Spacer(Modifier.weight(1f))
         destinations.forEach { destination ->
             NavigationRailItem(
diff --git a/app/src/androidMain/res/values/themes.xml b/app/src/androidMain/res/values/themes.xml
index efd070733..11cf59be2 100644
--- a/app/src/androidMain/res/values/themes.xml
+++ b/app/src/androidMain/res/values/themes.xml
@@ -3,6 +3,8 @@
     <style name="NightAdjusted.Theme.Katana" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:navigationBarColor">@null</item>
+        <item name="android:statusBarColor">@null</item>
     </style>
 
     <style name="NightAdjusted.Theme.Splash" parent="Theme.SplashScreen">
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9504ab7b3..54d8cbc8a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,9 +11,9 @@ dependencyResolutionManagement {
 pluginManagement {
     includeBuild("build-logic")
     repositories {
-        mavenCentral()
-        google()
         gradlePluginPortal()
+        google()
+        mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
 }
diff --git a/ui/base/src/commonMain/kotlin/dev/alvr/katana/ui/base/components/home/KatanaHomeScaffold.kt b/ui/base/src/commonMain/kotlin/dev/alvr/katana/ui/base/components/home/KatanaHomeScaffold.kt
index ea2eb51bd..097497b89 100644
--- a/ui/base/src/commonMain/kotlin/dev/alvr/katana/ui/base/components/home/KatanaHomeScaffold.kt
+++ b/ui/base/src/commonMain/kotlin/dev/alvr/katana/ui/base/components/home/KatanaHomeScaffold.kt
@@ -11,6 +11,7 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.material.BackdropScaffold
 import androidx.compose.material.BackdropScaffoldState
 import androidx.compose.material.BackdropValue
@@ -75,6 +76,7 @@ fun KatanaHomeScaffold(
         frontLayerContent = {
             Scaffold(
                 floatingActionButton = { fab?.invoke() },
+                contentWindowInsets = WindowInsets(0, 0, 0, 0),
                 content = content,
             )
         },
diff --git a/ui/login/src/androidMain/kotlin/dev/alvr/katana/ui/login/view/LoginScreen.kt b/ui/login/src/androidMain/kotlin/dev/alvr/katana/ui/login/view/LoginScreen.kt
index 4d7444240..e60e87014 100644
--- a/ui/login/src/androidMain/kotlin/dev/alvr/katana/ui/login/view/LoginScreen.kt
+++ b/ui/login/src/androidMain/kotlin/dev/alvr/katana/ui/login/view/LoginScreen.kt
@@ -19,6 +19,8 @@ import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -136,11 +138,14 @@ private fun Login(state: LoginState, onLogin: () -> Unit) {
         }
     }
 
-    Scaffold { padding ->
+    Scaffold(
+        contentWindowInsets = WindowInsets(0, 0, 0, 0),
+    ) { padding ->
         Surface(
             modifier = Modifier
                 .fillMaxSize()
-                .padding(padding),
+                .padding(padding)
+                .consumeWindowInsets(padding),
         ) {
             if (loading) {
                 Loading()
@@ -149,7 +154,9 @@ private fun Login(state: LoginState, onLogin: () -> Unit) {
                     painter = background.asPainter,
                     contentDescription = strings.contentDescriptionBackground,
                     contentScale = ContentScale.Crop,
-                    modifier = Modifier.alpha(BACKGROUND_ALPHA),
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .alpha(BACKGROUND_ALPHA),
                 )
 
                 Box(modifier = Modifier.padding(24.dp)) {
@@ -226,6 +233,7 @@ internal fun Bottom(modifier: Modifier = Modifier) {
                 State.GetStarted -> GetStarted { changedState ->
                     currentState = changedState
                 }
+
                 State.Buttons -> Begin()
             }
         }