diff --git a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
index 338b5520f..0d41f0f2e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/EhActivity.kt
@@ -26,7 +26,6 @@ import androidx.annotation.RequiresApi
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
-import androidx.core.view.WindowCompat
 import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
@@ -54,8 +53,6 @@ abstract class EhActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         layoutInflater.factory2 = LayoutInflaterFactory(delegate).addOnViewCreatedListener(WindowInsetsHelper.LISTENER)
         super.onCreate(savedInstanceState)
-        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = !isNightMode()
-        WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightNavigationBars = !isNightMode()
         (application as EhApplication).registerActivity(this)
     }
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7f091b8a4..72439ed18 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -30,9 +30,11 @@
         <item name="windowNoTitle">true</item>
 
         <!-- Transparent Status Bar -->
+        <item name="android:windowLightStatusBar">?isLightTheme</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
 
         <!-- Transparent Navigation Bar -->
+        <item name="android:windowLightNavigationBar">?isLightTheme</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>