diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e5f246d68..f1449cd37 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,10 @@
         tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="com.android.vending.BILLING" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_CONNECT"
+        android:usesPermissionFlags="neverForLocation"
+        tools:targetApi="s" />
 
     <application
         android:name=".App"
@@ -123,7 +126,10 @@
         <activity android:name=".activities.ShareInstagramStory" />
         <activity android:name=".activities.DriveModeActivity" />
         <activity android:name=".activities.PermissionActivity" />
-        <activity android:name=".activities.LockScreenActivity" />
+        <activity
+            android:name=".activities.LockScreenActivity"
+            android:launchMode="singleTop"
+            android:showOnLockScreen="true" />
         <activity
             android:name=".fragments.backup.RestoreActivity"
             android:excludeFromRecents="false"
@@ -170,20 +176,6 @@
             android:name=".activities.saf.SAFGuideActivity"
             android:theme="@style/Theme.Intro" />
 
-        <activity
-            android:name=".cast.ExpandedControlsActivity"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.AppCompat.NoActionBar">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".activities.MainActivity" />
-        </activity>
-
         <activity
             android:name=".activities.ErrorActivity"
             android:exported="true">
diff --git a/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt b/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt
index 7bbc955be..35115dafb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/cast/CastOptionsProvider.kt
@@ -3,6 +3,7 @@
 package code.name.monkey.retromusic.cast
 
 import android.content.Context
+import code.name.monkey.retromusic.activities.MainActivity
 import com.google.android.gms.cast.CastMediaControlIntent
 import com.google.android.gms.cast.framework.CastOptions
 import com.google.android.gms.cast.framework.OptionsProvider
@@ -22,12 +23,12 @@ class CastOptionsProvider : OptionsProvider {
         val compatButtonActionsIndices = intArrayOf(1, 3)
         val notificationOptions = NotificationOptions.Builder()
             .setActions(buttonActions, compatButtonActionsIndices)
-            .setTargetActivityClassName(ExpandedControlsActivity::class.java.name)
+            .setTargetActivityClassName(MainActivity::class.java.name)
             .build()
 
         val mediaOptions = CastMediaOptions.Builder()
             .setNotificationOptions(notificationOptions)
-            .setExpandedControllerActivityClassName(ExpandedControlsActivity::class.java.name)
+            .setExpandedControllerActivityClassName(MainActivity::class.java.name)
             .build()
 
         return CastOptions.Builder()
diff --git a/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedControlsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedControlsActivity.kt
deleted file mode 100644
index 2fbb2a4ff..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/cast/ExpandedControlsActivity.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package code.name.monkey.retromusic.cast
-
-
-import android.view.Menu
-import code.name.monkey.retromusic.R
-
-import com.google.android.gms.cast.framework.CastButtonFactory
-
-import com.google.android.gms.cast.framework.media.widget.ExpandedControllerActivity
-
-
-class ExpandedControlsActivity : ExpandedControllerActivity() {
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        super.onCreateOptionsMenu(menu)
-        menuInflater.inflate(R.menu.menu_cast, menu)
-        CastButtonFactory.setUpMediaRouteButton(this, menu, R.id.action_cast)
-        return true
-    }
-}
\ No newline at end of file