diff --git a/Reply/app/src/main/java/com/example/reply/ui/MainActivity.kt b/Reply/app/src/main/java/com/example/reply/ui/MainActivity.kt
index ca66807e8..62bb64a75 100644
--- a/Reply/app/src/main/java/com/example/reply/ui/MainActivity.kt
+++ b/Reply/app/src/main/java/com/example/reply/ui/MainActivity.kt
@@ -19,7 +19,6 @@ package com.example.reply.ui
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
@@ -40,7 +39,6 @@ class MainActivity : ComponentActivity() {
 
     @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         setContent {
diff --git a/Reply/app/src/main/java/com/example/reply/ui/theme/Theme.kt b/Reply/app/src/main/java/com/example/reply/ui/theme/Theme.kt
index 209cbeb06..163590a28 100644
--- a/Reply/app/src/main/java/com/example/reply/ui/theme/Theme.kt
+++ b/Reply/app/src/main/java/com/example/reply/ui/theme/Theme.kt
@@ -16,7 +16,11 @@
 
 package com.example.reply.ui.theme
 
+import android.graphics.Color
 import android.os.Build
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
@@ -91,6 +95,13 @@ fun ReplyTheme(
     dynamicColor: Boolean = true,
     content: @Composable () -> Unit
 ) {
+    val transparent = Color.TRANSPARENT
+    (LocalContext.current as ComponentActivity).enableEdgeToEdge(
+        navigationBarStyle = if (darkTheme)
+            SystemBarStyle.dark(transparent)
+        else
+            SystemBarStyle.light(transparent, transparent)
+    )
     val replyColorScheme = when {
         dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
             val context = LocalContext.current