diff --git a/app/src/main/kotlin/com/gemwallet/android/MainActivity.kt b/app/src/main/kotlin/com/gemwallet/android/MainActivity.kt
index 9acfce864..cf2ed4ab5 100644
--- a/app/src/main/kotlin/com/gemwallet/android/MainActivity.kt
+++ b/app/src/main/kotlin/com/gemwallet/android/MainActivity.kt
@@ -81,8 +81,8 @@ class MainActivity : FragmentActivity(), AuthRequester {
     private var onSuccessAuth: (() -> Unit)? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         prepareBiometricAuth()
 
         viewModel.handleIntent(this@MainActivity.intent)
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a7a06fc0c..40bf9325d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.Wallet" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.Wallet" parent="Theme.Material3.DayNight.NoActionBar" />
 </resources>
\ No newline at end of file