diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index ac2a70a1..f6f39a2d 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -24,6 +24,7 @@ import android.view.KeyEvent
 import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
@@ -59,6 +60,7 @@ class MainActivity : ComponentActivity() {
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
 
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
         val extraAction = intent.getStringExtra("action")
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Theme.kt b/app/src/main/kotlin/com/tutpro/baresip/Theme.kt
index 376aedb0..27efd704 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Theme.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Theme.kt
@@ -1,6 +1,5 @@
 package com.tutpro.baresip
 
-import android.app.Activity
 import android.os.Build.VERSION
 import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
@@ -15,11 +14,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
-import androidx.core.graphics.ColorUtils
-import androidx.core.view.WindowCompat
 
 @Composable
 fun AppTheme(
@@ -121,19 +117,6 @@ fun AppTheme(
                 if (VERSION.SDK_INT >= 29)
                     activity.window.isNavigationBarContrastEnforced = false
             }
-            else {
-                val window = (view.context as Activity).window
-                val insetsController = WindowCompat.getInsetsController(window, view)
-                if (VERSION.SDK_INT < 35)
-                    @Suppress("DEPRECATION")
-                    window.navigationBarColor = android.graphics.Color.TRANSPARENT
-                if (VERSION.SDK_INT >= 29)
-                    window.isNavigationBarContrastEnforced = false
-                val isBackgroundEffectivelyLight =
-                    ColorUtils.calculateLuminance(colorScheme.background.toArgb()) > 0.5
-                insetsController.isAppearanceLightStatusBars = isBackgroundEffectivelyLight
-                insetsController.isAppearanceLightNavigationBars = isBackgroundEffectivelyLight
-            }
         }
 
     MaterialTheme(colorScheme = colorScheme, content = content)