diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
index 7c5013b88..7bf32e80e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
@@ -18,9 +18,9 @@ import android.app.KeyguardManager
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
-import android.view.View
 import android.view.WindowManager
 import androidx.core.view.ViewCompat
+import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.databinding.ActivityLockScreenBinding
@@ -46,7 +46,6 @@ class LockScreenActivity : AbsMusicServiceActivity() {
         binding = ActivityLockScreenBinding.inflate(layoutInflater)
         setContentView(binding.root)
         hideStatusBar()
-        setStatusBarColorAuto()
         setTaskDescriptionColorAuto()
 
         val config = SlidrConfig.Builder().listener(object : SlidrListener {
@@ -60,7 +59,7 @@ class LockScreenActivity : AbsMusicServiceActivity() {
             }
 
             override fun onSlideClosed(): Boolean {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                if (VersionUtils.hasOreo()) {
                     val keyguardManager =
                         getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
                     keyguardManager.requestDismissKeyguard(this@LockScreenActivity, null)
@@ -74,7 +73,7 @@ class LockScreenActivity : AbsMusicServiceActivity() {
 
         fragment = whichFragment<LockScreenControlsFragment>(R.id.playback_controls_fragment)
 
-        findViewById<View>(R.id.slide).apply {
+        binding.slide.apply {
             translationY = 100f
             alpha = 0f
             ViewCompat.animate(this).translationY(0f).alpha(1f).setDuration(1500).start()
diff --git a/app/src/main/res/layout/activity_lock_screen.xml b/app/src/main/res/layout/activity_lock_screen.xml
index c02b99813..2f49f9b3a 100644
--- a/app/src/main/res/layout/activity_lock_screen.xml
+++ b/app/src/main/res/layout/activity_lock_screen.xml
@@ -56,6 +56,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
+        android:fitsSystemWindows="true"
         android:gravity="center"
         android:padding="16dp"
         android:text="@string/swipe_to_unlock"