diff --git a/build.gradle b/build.gradle
index d049b1bc8cc..6211f7aa4bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,7 +37,6 @@ allprojects {
         }
         dependencies {
             implementation 'androidx.core:core-ktx:1.13.1'
-            implementation 'androidx.appcompat:appcompat:1.7.0'
         }
     }
 
diff --git a/lawnchair/src/app/lawnchair/BlankActivity.kt b/lawnchair/src/app/lawnchair/BlankActivity.kt
index a64f01cbbaf..8ceaa92908c 100644
--- a/lawnchair/src/app/lawnchair/BlankActivity.kt
+++ b/lawnchair/src/app/lawnchair/BlankActivity.kt
@@ -6,11 +6,11 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.os.ResultReceiver
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.BottomSheetDefaults
@@ -27,7 +27,7 @@ import app.lawnchair.util.unsafeLazy
 import kotlin.coroutines.resume
 import kotlinx.coroutines.suspendCancellableCoroutine
 
-class BlankActivity : AppCompatActivity() {
+class BlankActivity : ComponentActivity() {
 
     private val resultReceiver by unsafeLazy { intent.getParcelableExtra<ResultReceiver>("callback")!! }
     private var resultSent = false
@@ -92,7 +92,7 @@ class BlankActivity : AppCompatActivity() {
                         resultReceiver.send(it.resultCode, it.data?.extras)
                         resultSent = true
                         finish()
-                    }.launch(intent.getParcelableExtra("intent"))
+                    }.launch(requireNotNull(intent.getParcelableExtra("intent")))
                 }
             }
             else -> {
diff --git a/lawnchair/src/app/lawnchair/smartspace/SmartspacePreferencesShortcut.kt b/lawnchair/src/app/lawnchair/smartspace/SmartspacePreferencesShortcut.kt
index cdce174e858..39c835cd331 100644
--- a/lawnchair/src/app/lawnchair/smartspace/SmartspacePreferencesShortcut.kt
+++ b/lawnchair/src/app/lawnchair/smartspace/SmartspacePreferencesShortcut.kt
@@ -1,11 +1,11 @@
 package app.lawnchair.smartspace
 
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import androidx.activity.ComponentActivity
 import app.lawnchair.ui.preferences.PreferenceActivity
 import app.lawnchair.ui.preferences.navigation.Routes
 
-class SmartspacePreferencesShortcut : AppCompatActivity() {
+class SmartspacePreferencesShortcut : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt
index 19bf9f12be0..ccfd87817aa 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/PreferenceActivity.kt
@@ -22,10 +22,10 @@ import android.content.ContextWrapper
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.compose.runtime.DisposableEffect
@@ -33,7 +33,7 @@ import androidx.core.net.toUri
 import app.lawnchair.ui.theme.LawnchairTheme
 import app.lawnchair.ui.theme.isSelectedThemeDark
 
-class PreferenceActivity : AppCompatActivity() {
+class PreferenceActivity : ComponentActivity() {
     @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)