diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 82d22288..e1c24932 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -6,12 +6,11 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application
     android:label="Claw"
-    android:allowBackup="false"
     android:supportsRtl="true"
     android:icon="@mipmap/ic_launcher"
     android:roundIcon="@mipmap/ic_launcher"
     android:name=".ClawApplication"
-    android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+    android:theme="@style/Theme.Claw"
   >
             <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>
diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt
index d3a9e59c..4d896195 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt
@@ -1,8 +1,8 @@
 package dev.msfjarvis.claw.android
 
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -29,7 +29,7 @@ import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
   @Inject lateinit var api: LobstersApi
 
   @Inject lateinit var urlLauncher: UrlLauncher
diff --git a/android/src/main/res/values-night/bools.xml b/android/src/main/res/values-night/bools.xml
new file mode 100644
index 00000000..69eb1d16
--- /dev/null
+++ b/android/src/main/res/values-night/bools.xml
@@ -0,0 +1,5 @@
+<?xml
+version="1.0" encoding="utf-8" ?>
+<resources>
+    <bool name="use_light_status_bar">false</bool>
+</resources>
diff --git a/android/src/main/res/values/bools.xml b/android/src/main/res/values/bools.xml
new file mode 100644
index 00000000..c2c39a0d
--- /dev/null
+++ b/android/src/main/res/values/bools.xml
@@ -0,0 +1,5 @@
+<?xml
+version="1.0" encoding="utf-8" ?>
+<resources>
+    <bool name="use_light_status_bar">true</bool>
+</resources>
diff --git a/android/src/main/res/values/themes.xml b/android/src/main/res/values/themes.xml
new file mode 100644
index 00000000..96b5971d
--- /dev/null
+++ b/android/src/main/res/values/themes.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+
+    <style name="Platform.Theme.Claw" parent="android:Theme.Material.Light.NoActionBar" />
+
+    <style name="Base.Theme.Claw" parent="Platform.Theme.Claw">
+        <item name="android:windowActionModeOverlay">true</item>
+    </style>
+
+    <style name="Theme.Claw" parent="Base.Theme.Claw">
+        <item name="android:windowLightStatusBar">@bool/use_light_status_bar</item>
+    </style>
+</resources>