diff --git a/play-services-base/core/src/main/res/values/themes.xml b/play-services-base/core/src/main/res/values/themes.xml
index be7e8ff4..a125f9cf 100644
--- a/play-services-base/core/src/main/res/values/themes.xml
+++ b/play-services-base/core/src/main/res/values/themes.xml
@@ -6,6 +6,45 @@
 
 <resources>
 
+    <style name="Theme.Base.Light.Dialog" parent="Theme.AppCompat.Light.Dialog" />
+
+    <style name="Theme.Base.Light.Dialog.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Theme.Base.Light.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert" />
+
+    <style name="Theme.Base.Light.Dialog.Alert.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Theme.Base.DayNight.Dialog.Alert" parent="Theme.AppCompat.DayNight.Dialog.Alert" />
+
+    <style name="Theme.Base.DayNight.Dialog.Alert.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Theme.Base.Translucent" parent="Theme.Base.DayNight.Dialog.Alert.NoActionBar">
+        <item name="background">@android:color/transparent</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+    </style>
+
+    <style name="Theme.App.Translucent" parent="Theme.Base.Translucent" />
+    <style name="Theme.App.DayNight.Dialog.Alert.NoActionBar" parent="Theme.Base.DayNight.Dialog.Alert.NoActionBar" />
+    <style name="Theme.App.Light.Dialog.NoActionBar" parent="Theme.Base.Light.Dialog.NoActionBar" />
+    <style name="Theme.App.Light.Dialog.Alert.NoActionBar" parent="Theme.Base.Light.Dialog.Alert.NoActionBar" />
+
+    <!-- compatibility -->
+
     <style name="Theme.AppCompat.Light.Dialog.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -32,6 +71,8 @@
         <item name="android:windowAnimationStyle">@android:style/Animation</item>
     </style>
 
+    <!-- Switch Bar -->
+
     <declare-styleable name="PreferenceTheme">
         <attr format="reference" name="switchBarPreferenceStyle"/>
     </declare-styleable>
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 1fe256b1..979e503d 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -290,7 +290,12 @@
             android:name="org.microg.tools.AccountPickerActivity"
             android:excludeFromRecents="true"
             android:exported="true"
+<<<<<<< HEAD
             android:process=":ui">
+=======
+            android:process=":ui"
+            android:theme="@style/Theme.App.DayNight.Dialog.Alert.NoActionBar">
+>>>>>>> bcb5f7cf (Improve location settings dialog)
             <intent-filter>
                 <action android:name="com.google.android.gms.common.account.CHOOSE_ACCOUNT" />
 
@@ -361,7 +366,7 @@
 <<<<<<< HEAD
 =======
             android:name="org.microg.gms.auth.signin.AuthSignInActivity"
-            android:theme="@style/Theme.AppCompat.DayNight.Dialog.Alert.NoActionBar"
+            android:theme="@style/Theme.App.DayNight.Dialog.Alert.NoActionBar"
             android:process=":ui"
             android:exported="true">
             <intent-filter>
@@ -401,7 +406,7 @@
             android:enabled="true"
             android:exported="false"
             android:process=":ui"
-            android:theme="@style/Theme.Translucent"/>
+            android:theme="@style/Theme.App.Translucent"/>
 
         <activity
             android:name="org.microg.gms.games.UpgradeActivity"
@@ -532,6 +537,24 @@
                 android:resource="@string/gms_settings_summary" />
         </activity-alias>
 
+<<<<<<< HEAD
+=======
+        <!-- microG Settings activity-alias for Google settings compatibility -->
+        <activity-alias
+            android:name="com.google.android.gms.app.settings.GoogleSettingsLink"
+            android:process=":ui"
+            android:exported="true"
+            android:targetActivity="org.microg.gms.ui.MainSettingsActivity"
+            android:taskAffinity="org.microg.gms.settings">
+        </activity-alias>
+
+        <activity
+            android:name="org.microg.gms.ui.AskPushPermission"
+            android:excludeFromRecents="true"
+            android:process=":ui"
+            android:theme="@style/Theme.App.DayNight.Dialog.Alert.NoActionBar" />
+
+>>>>>>> bcb5f7cf (Improve location settings dialog)
         <activity
             android:name="org.microg.gms.ui.GoogleMoreFragment$AsActivity"
             android:label="@string/gms_settings_name"
@@ -556,6 +579,21 @@
                 <action android:name="com.google.android.gms.accountsettings.ACCOUNT_PREFERENCES_SETTINGS" />
                 <action android:name="com.google.android.gms.accountsettings.PRIVACY_SETTINGS" />
                 <action android:name="com.google.android.gms.accountsettings.SECURITY_SETTINGS" />
+<<<<<<< HEAD
+=======
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="org.microg.gms.accountsettings.ui.LoaderActivity"
+            android:process=":ui"
+            android:exported="true"
+            android:excludeFromRecents="true"
+            android:theme="@style/Theme.App.DayNight.Dialog.Alert.NoActionBar">
+            <intent-filter>
+>>>>>>> bcb5f7cf (Improve location settings dialog)
                 <action android:name="com.google.android.gms.accountsettings.action.VIEW_SETTINGS" />
                 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -653,7 +691,7 @@
             android:name="com.google.android.gms.feedback.FeedbackActivity"
             android:exported="true"
             android:excludeFromRecents="true"
-            android:theme="@style/Theme.Translucent"/>
+            android:theme="@style/Theme.App.Translucent"/>
 
         <service android:name="org.microg.gms.clearcut.ClearcutLoggerService">
             <intent-filter>
diff --git a/play-services-core/src/main/res/values-night-v8/themes.xml b/play-services-core/src/main/res/values-night-v8/themes.xml
index 3ed65363..8a6ebbe9 100644
--- a/play-services-core/src/main/res/values-night-v8/themes.xml
+++ b/play-services-core/src/main/res/values-night-v8/themes.xml
@@ -56,4 +56,55 @@
         <item name="colorSurfaceContainerHigh">#ff282a2c</item>
         <item name="colorSurfaceContainerHighest">#ff333537</item>
     </style>
+
+    <!-- TODO: Heavy duplication -->
+    <style name="Theme.App.Translucent" parent="Theme.Base.Translucent">
+        <item name="colorPrimary">@color/gm3_ref_palette_primary80</item>
+        <item name="colorOnPrimary">@color/gm3_ref_palette_primary20</item>
+        <item name="colorPrimaryContainer">@color/gm3_ref_palette_primary30</item>
+        <item name="colorOnPrimaryContainer">@color/gm3_ref_palette_primary90</item>
+        <item name="colorPrimaryInverse">@color/gm3_ref_palette_primary40</item>
+        <item name="colorPrimaryFixed">@color/gm3_ref_palette_primary90</item>
+        <item name="colorPrimaryFixedDim">@color/gm3_ref_palette_primary80</item>
+        <item name="colorOnPrimaryFixed">@color/gm3_ref_palette_primary10</item>
+        <item name="colorOnPrimaryFixedVariant">@color/gm3_ref_palette_primary30</item>
+        <item name="colorSecondary">@color/gm3_ref_palette_secondary80</item>
+        <item name="colorOnSecondary">@color/gm3_ref_palette_secondary20</item>
+        <item name="colorSecondaryContainer">@color/gm3_ref_palette_secondary30</item>
+        <item name="colorOnSecondaryContainer">@color/gm3_ref_palette_secondary90</item>
+        <item name="colorSecondaryFixed">@color/gm3_ref_palette_secondary90</item>
+        <item name="colorSecondaryFixedDim">@color/gm3_ref_palette_secondary80</item>
+        <item name="colorOnSecondaryFixed">@color/gm3_ref_palette_secondary10</item>
+        <item name="colorOnSecondaryFixedVariant">@color/gm3_ref_palette_secondary30</item>
+        <item name="colorTertiary">@color/gm3_ref_palette_tertiary80</item>
+        <item name="colorOnTertiary">@color/gm3_ref_palette_tertiary20</item>
+        <item name="colorTertiaryContainer">@color/gm3_ref_palette_tertiary30</item>
+        <item name="colorOnTertiaryContainer">@color/gm3_ref_palette_tertiary90</item>
+        <item name="colorTertiaryFixed">@color/gm3_ref_palette_tertiary90</item>
+        <item name="colorTertiaryFixedDim">@color/gm3_ref_palette_tertiary80</item>
+        <item name="colorOnTertiaryFixed">@color/gm3_ref_palette_tertiary10</item>
+        <item name="colorOnTertiaryFixedVariant">@color/gm3_ref_palette_tertiary30</item>
+
+        <item name="colorError">@color/gm3_ref_palette_error80</item>
+        <item name="colorOnError">@color/gm3_ref_palette_error20</item>
+        <item name="colorErrorContainer">@color/gm3_ref_palette_error30</item>
+        <item name="colorOnErrorContainer">@color/gm3_ref_palette_error90</item>
+        <item name="colorOutline">@color/gm3_ref_palette_neutral_variant60</item>
+        <item name="colorOutlineVariant">@color/gm3_ref_palette_neutral_variant30</item>
+        <item name="android:colorBackground">@color/gm3_ref_palette_neutral6</item>
+        <item name="colorOnBackground">@color/gm3_ref_palette_neutral90</item>
+        <item name="colorSurface">@color/gm3_ref_palette_neutral6</item>
+        <item name="colorOnSurface">@color/gm3_ref_palette_neutral90</item>
+        <item name="colorSurfaceVariant">@color/gm3_ref_palette_neutral_variant30</item>
+        <item name="colorOnSurfaceVariant">@color/gm3_ref_palette_neutral_variant80</item>
+        <item name="colorSurfaceInverse">@color/gm3_ref_palette_neutral90</item>
+        <item name="colorOnSurfaceInverse">@color/gm3_ref_palette_neutral20</item>
+        <item name="colorSurfaceBright">#ff37393b</item>
+        <item name="colorSurfaceDim">@color/gm3_ref_palette_neutral6</item>
+        <item name="colorSurfaceContainer">#ff1e1f20</item>
+        <item name="colorSurfaceContainerLow">#ff1b1b1b</item>
+        <item name="colorSurfaceContainerLowest">#ff0e0e0e</item>
+        <item name="colorSurfaceContainerHigh">#ff282a2c</item>
+        <item name="colorSurfaceContainerHighest">#ff333537</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/values/themes.xml b/play-services-core/src/main/res/values/themes.xml
index 56bb40bc..320f41aa 100755
--- a/play-services-core/src/main/res/values/themes.xml
+++ b/play-services-core/src/main/res/values/themes.xml
@@ -36,6 +36,8 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="Theme.Base.DayNight.Dialog.Alert" parent="Theme.Material3.DayNight.Dialog.Alert" />
+
     <!-- Preference theme -->
     <style name="Theme.Base.PreferenceThemeOverlay" parent="@style/PreferenceThemeOverlay">
         <item name="switchPreferenceCompatStyle">@style/Theme.Base.Preference.SwitchPreferenceCompat</item>
@@ -96,12 +98,65 @@
         <item name="colorSurfaceContainerHighest">#ffdde3ea</item>
     </style>
 
+<<<<<<< HEAD
 >>>>>>> 566215bd (UI: Port more to Material 3)
+=======
+    <!-- TODO: Heavy duplication -->
+    <style name="Theme.App.Translucent" parent="Theme.Base.Translucent">
+        <item name="colorPrimary">@color/gm3_ref_palette_primary40</item>
+        <item name="colorOnPrimary">@color/gm3_ref_palette_primary100</item>
+        <item name="colorPrimaryContainer">@color/gm3_ref_palette_primary90</item>
+        <item name="colorOnPrimaryContainer">@color/gm3_ref_palette_primary10</item>
+        <item name="colorPrimaryInverse">@color/gm3_ref_palette_primary80</item>
+        <item name="colorPrimaryFixed">@color/gm3_ref_palette_primary90</item>
+        <item name="colorPrimaryFixedDim">@color/gm3_ref_palette_primary80</item>
+        <item name="colorOnPrimaryFixed">@color/gm3_ref_palette_primary10</item>
+        <item name="colorOnPrimaryFixedVariant">@color/gm3_ref_palette_primary30</item>
+        <item name="colorSecondary">@color/gm3_ref_palette_secondary40</item>
+        <item name="colorOnSecondary">@color/gm3_ref_palette_secondary100</item>
+        <item name="colorSecondaryContainer">@color/gm3_ref_palette_secondary90</item>
+        <item name="colorOnSecondaryContainer">@color/gm3_ref_palette_secondary10</item>
+        <item name="colorSecondaryFixed">@color/gm3_ref_palette_secondary90</item>
+        <item name="colorSecondaryFixedDim">@color/gm3_ref_palette_secondary80</item>
+        <item name="colorOnSecondaryFixed">@color/gm3_ref_palette_secondary10</item>
+        <item name="colorOnSecondaryFixedVariant">@color/gm3_ref_palette_secondary30</item>
+        <item name="colorTertiary">@color/gm3_ref_palette_tertiary40</item>
+        <item name="colorOnTertiary">@color/gm3_ref_palette_tertiary100</item>
+        <item name="colorTertiaryContainer">@color/gm3_ref_palette_tertiary90</item>
+        <item name="colorOnTertiaryContainer">@color/gm3_ref_palette_tertiary10</item>
+        <item name="colorTertiaryFixed">@color/gm3_ref_palette_tertiary90</item>
+        <item name="colorTertiaryFixedDim">@color/gm3_ref_palette_tertiary80</item>
+        <item name="colorOnTertiaryFixed">@color/gm3_ref_palette_tertiary10</item>
+        <item name="colorOnTertiaryFixedVariant">@color/gm3_ref_palette_tertiary30</item>
+
+        <item name="colorError">@color/gm3_ref_palette_error40</item>
+        <item name="colorOnError">@color/gm3_ref_palette_error100</item>
+        <item name="colorErrorContainer">@color/gm3_ref_palette_error90</item>
+        <item name="colorOnErrorContainer">@color/gm3_ref_palette_error10</item>
+        <item name="colorOutline">@color/gm3_ref_palette_neutral_variant50</item>
+        <item name="colorOutlineVariant">@color/gm3_ref_palette_neutral_variant80</item>
+        <item name="android:colorBackground">@color/gm3_ref_palette_neutral100</item>
+        <item name="colorOnBackground">@color/gm3_ref_palette_neutral10</item>
+        <item name="colorSurface">@color/gm3_ref_palette_neutral100</item>
+        <item name="colorOnSurface">@color/gm3_ref_palette_neutral10</item>
+        <item name="colorSurfaceVariant">@color/gm3_ref_palette_neutral_variant90</item>
+        <item name="colorOnSurfaceVariant">@color/gm3_ref_palette_neutral_variant30</item>
+        <item name="colorSurfaceInverse">@color/gm3_ref_palette_neutral20</item>
+        <item name="colorOnSurfaceInverse">@color/gm3_ref_palette_neutral90</item>
+        <item name="colorSurfaceBright">@color/gm3_ref_palette_neutral100</item>
+        <item name="colorSurfaceDim">#ffd3dbe5</item>
+        <item name="colorSurfaceContainer">#fff0f4f9</item>
+        <item name="colorSurfaceContainerLow">#fff8fafd</item>
+        <item name="colorSurfaceContainerLowest">@color/gm3_ref_palette_primary100</item>
+        <item name="colorSurfaceContainerHigh">#ffe9eef6</item>
+        <item name="colorSurfaceContainerHighest">#ffdde3ea</item>
+    </style>
+
+>>>>>>> bcb5f7cf (Improve location settings dialog)
     <style name="Theme.LoginBlue" parent="Theme.LoginBlue.Base" />
     <style name="Theme.LoginBlue.Base" parent="Theme.Material3.DayNight">
         <item name="colorPrimary">@color/login_blue_theme_primary</item>
-        <item name="colorPrimaryDark">@color/login_blue_theme_primary_dark
-        </item>
+        <item name="colorPrimaryDark">@color/login_blue_theme_primary_dark</item>
         <item name="colorAccent">@color/login_blue_theme_accent</item>
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
diff --git a/play-services-location/core/src/main/AndroidManifest.xml b/play-services-location/core/src/main/AndroidManifest.xml
index ae320904..50700759 100644
--- a/play-services-location/core/src/main/AndroidManifest.xml
+++ b/play-services-location/core/src/main/AndroidManifest.xml
@@ -27,7 +27,7 @@
             android:excludeFromRecents="true"
             android:exported="false"
             android:process=":ui"
-            android:theme="@style/AlertThemeSelector">
+            android:theme="@style/Theme.App.Translucent">
             <intent-filter android:priority="-1">
                 <action android:name="com.google.android.gms.location.settings.CHECK_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -38,7 +38,7 @@
             android:name="org.microg.gms.location.manager.AskPermissionActivity"
             android:excludeFromRecents="true"
             android:process=":ui"
-            android:theme="@style/Theme.Translucent"
+            android:theme="@style/Theme.App.Translucent"
             android:exported="false" />
 
         <service
diff --git a/play-services-location/core/src/main/kotlin/org/microg/gms/location/settings/LocationSettingsCheckerActivity.kt b/play-services-location/core/src/main/kotlin/org/microg/gms/location/settings/LocationSettingsCheckerActivity.kt
index d30fc22e..ee55b70c 100644
--- a/play-services-location/core/src/main/kotlin/org/microg/gms/location/settings/LocationSettingsCheckerActivity.kt
+++ b/play-services-location/core/src/main/kotlin/org/microg/gms/location/settings/LocationSettingsCheckerActivity.kt
@@ -7,56 +7,195 @@ package org.microg.gms.location.settings
 
 import android.app.Activity
 import android.content.Context
+import android.content.DialogInterface
 import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
 import android.location.LocationManager
 import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
+import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import com.google.android.gms.common.internal.safeparcel.SafeParcelableSerializer
+import com.google.android.gms.location.LocationRequest
+import com.google.android.gms.location.LocationSettingsRequest
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.microg.gms.location.core.R
 
 const val ACTION_LOCATION_SETTINGS_CHECKER = "com.google.android.gms.location.settings.CHECK_SETTINGS"
-
-private const val REQUEST_CODE_LOCATION = 120
 const val EXTRA_ORIGINAL_PACKAGE_NAME = "originalPackageName"
 const val EXTRA_SETTINGS_REQUEST = "locationSettingsRequests"
+const val EXTRA_REQUESTS = "locationRequests"
+const val EXTRA_SETTINGS_STATES = "com.google.android.gms.location.LOCATION_SETTINGS_STATES"
 
-class LocationSettingsCheckerActivity : Activity() {
+private const val REQUEST_CODE_LOCATION = 120
+private const val TAG = "LocationSettings"
+
+class LocationSettingsCheckerActivity : Activity(), DialogInterface.OnCancelListener, DialogInterface.OnClickListener {
+    private var alwaysShow = false
+    private var needBle = false
+    private var improvements = emptyList<Improvement>()
+    private var requests: List<LocationRequest>? = null
+    private var callingPackage: String? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_location_setting_checker)
-
-        findViewById<TextView>(R.id.location_setting_checker_sure).setOnClickListener {
-            // TODO: We also should handle permissions, Airplane Mode and BLE here.
-            val intent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
-            startActivityForResult(intent, REQUEST_CODE_LOCATION)
+        callingPackage = callingActivity?.packageName
+        if (callingPackage == null) {
+            Log.e(TAG, "Started without calling activity set")
+            finishResult(RESULT_CANCELED)
+            return
         }
-        findViewById<TextView>(R.id.location_setting_checker_cancel).setOnClickListener {
-            checkerBack(RESULT_CANCELED)
+        if (intent.hasExtra(EXTRA_SETTINGS_REQUEST)) {
+            try {
+                val request = SafeParcelableSerializer.deserializeFromBytes(intent.getByteArrayExtra(EXTRA_SETTINGS_REQUEST), LocationSettingsRequest.CREATOR)
+                alwaysShow = request.alwaysShow
+                needBle = request.needBle
+                requests = request.requests
+                val originalCallingPackage = intent.getStringExtra(EXTRA_ORIGINAL_PACKAGE_NAME)
+                if (callingPackage == packageName && originalCallingPackage != null) {
+                    callingPackage = originalCallingPackage
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, e)
+            }
+        }
+        if (requests == null && intent.hasExtra(EXTRA_REQUESTS)) {
+            try {
+                val arrayList = intent.getSerializableExtra(EXTRA_REQUESTS) as? ArrayList<*>
+                requests = arrayList?.map {
+                    SafeParcelableSerializer.deserializeFromBytes(it as ByteArray, LocationRequest.CREATOR)
+                }
+            } catch (e: Exception) {
+                Log.w(TAG, e)
+            }
+        }
+        if (requests == null) {
+            finishResult(RESULT_CANCELED)
+        } else {
+            updateImprovements()
+            if (improvements.isEmpty()) {
+                finishResult(RESULT_OK)
+            } else {
+                showDialog()
+            }
         }
     }
 
+    enum class Improvement {
+        GPS, NLP, GPS_AND_NLP, WIFI, WIFI_SCANNING, BLUETOOTH, BLE_SCANNING, PERMISSIONS, DATA_SOURCE
+    }
+
+    private fun updateImprovements() {
+        val detailedStates = getDetailedLocationSettingsStates()
+        // TODO: Correctly determine the needed improvements based on requests
+        improvements = listOfNotNull(
+            Improvement.GPS_AND_NLP.takeIf { !detailedStates.gpsUsable || !detailedStates.networkLocationUsable },
+//            Improvement.PERMISSIONS.takeIf { !detailedStates.coarseLocationPermission || !detailedStates.fineLocationPermission || !detailedStates.backgroundLocationPermission },
+        )
+    }
+
+    private fun showDialog() {
+
+        val alertDialog = try {
+            // Try material design first
+            MaterialAlertDialogBuilder(this)
+        } catch (e: Exception) {
+            AlertDialog.Builder(this)
+        }
+                .setOnCancelListener(this)
+                .setPositiveButton(R.string.location_settings_dialog_btn_sure, this)
+                .setNegativeButton(R.string.location_settings_dialog_btn_cancel, this)
+                .create()
+        alertDialog.setCanceledOnTouchOutside(false)
+
+        val view = layoutInflater.inflate(R.layout.location_settings_dialog, null)
+        view.findViewById<TextView>(R.id.message_title)
+            .setText(if (alwaysShow) R.string.location_settings_dialog_message_title_to_continue else R.string.location_settings_dialog_message_title_for_better_experience)
+
+        val messages = view.findViewById<LinearLayout>(R.id.messages)
+        for ((messageIndex, improvement) in improvements.withIndex()) {
+            val item = layoutInflater.inflate(R.layout.location_settings_dialog_item, messages, false)
+            item.findViewById<TextView>(android.R.id.text1).text = when (improvement) {
+                Improvement.GPS_AND_NLP -> getString(R.string.location_settings_dialog_message_location_services_gps_and_nlp)
+                else -> {
+                    Log.w(TAG, "Unsupported improvement: $improvement")
+                    ""
+                }
+            }
+            item.findViewById<ImageView>(android.R.id.icon).setImageDrawable(
+                when (improvement) {
+                    Improvement.GPS_AND_NLP -> ContextCompat.getDrawable(this, R.drawable.ic_gps)
+                    else -> {
+                        Log.w(TAG, "Unsupported improvement: $improvement")
+                        null
+                    }
+                }
+            )
+            messages.addView(item, messageIndex + 1)
+        }
+
+        alertDialog.setView(view)
+        alertDialog.show()
+    }
+
+    private fun handleContinue() {
+        val improvement = improvements.firstOrNull() ?: return finishResult(RESULT_OK)
+        when (improvement) {
+            Improvement.GPS, Improvement.NLP, Improvement.GPS_AND_NLP -> {
+                // TODO: If we have permission to, just activate directly
+                val intent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
+                startActivityForResult(intent, REQUEST_CODE_LOCATION)
+                return // We will continue from onActivityResult
+            }
+            else -> {
+                Log.w(TAG, "Unsupported improvement: $improvement")
+            }
+        }
+        updateImprovements()
+        handleContinue()
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == REQUEST_CODE_LOCATION && isLocationEnabled(this)) {
-            checkerBack(RESULT_OK)
+        if (requestCode == REQUEST_CODE_LOCATION) {
+            // Check if we improved, if so continue, otherwise show dialog again
+            val oldImprovements = improvements
+            updateImprovements()
+            if (oldImprovements == improvements) {
+                showDialog()
+            } else {
+                handleContinue()
+            }
         } else {
             super.onActivityResult(requestCode, resultCode, data)
         }
     }
 
-    override fun onBackPressed() {
-        checkerBack(RESULT_CANCELED)
-    }
-
-    private fun checkerBack(resultCode: Int) {
-        setResult(resultCode)
+    private fun finishResult(resultCode: Int) {
+        val states = getDetailedLocationSettingsStates().toApi()
+        setResult(resultCode, Intent().apply {
+            putExtra(EXTRA_SETTINGS_STATES, SafeParcelableSerializer.serializeToBytes(states))
+        })
         finish()
     }
 
-    private fun isLocationEnabled(context: Context): Boolean {
-        val locationManager = context.getSystemService(LOCATION_SERVICE) as LocationManager
-        return locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER) || locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
+    override fun onBackPressed() {
+        finishResult(RESULT_CANCELED)
     }
 
+    override fun onCancel(dialog: DialogInterface?) {
+        finishResult(RESULT_CANCELED)
+    }
+
+    override fun onClick(dialog: DialogInterface?, which: Int) {
+        Log.d(TAG, "Not yet implemented: onClick")
+        when (which) {
+            DialogInterface.BUTTON_NEGATIVE -> finishResult(RESULT_CANCELED)
+            DialogInterface.BUTTON_POSITIVE -> handleContinue()
+        }
+    }
 }
\ No newline at end of file
diff --git a/play-services-location/core/src/main/res/drawable/custom_dialog_background.xml b/play-services-location/core/src/main/res/drawable/custom_dialog_background.xml
deleted file mode 100644
index c4f7f602..00000000
--- a/play-services-location/core/src/main/res/drawable/custom_dialog_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#2a2931" />
-    <corners android:radius="20dp" />
-</shape>
\ No newline at end of file
diff --git a/play-services-location/core/src/main/res/drawable/ic_gps.xml b/play-services-location/core/src/main/res/drawable/ic_gps.xml
new file mode 100644
index 00000000..56750b76
--- /dev/null
+++ b/play-services-location/core/src/main/res/drawable/ic_gps.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ SPDX-FileCopyrightText: 2019 The Android Open Source Project
+  ~ SPDX-FileCopyrightText: 2024 microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<vector android:height="24dp"
+    android:tint="?attr/colorAccent"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" />
+</vector>
diff --git a/play-services-location/core/src/main/res/layout/activity_location_setting_checker.xml b/play-services-location/core/src/main/res/layout/activity_location_setting_checker.xml
deleted file mode 100644
index 0c0af3c6..00000000
--- a/play-services-location/core/src/main/res/layout/activity_location_setting_checker.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingHorizontal="20dp"
-    android:paddingTop="16dp">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/location_settings_dialog_message_title_to_continue"
-        android:textColor="#e4e1e5"
-        android:textSize="16sp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="10dp"
-        android:text="@string/location_settings_dialog_message_details_start_paragraph"
-        android:textColor="#e4e1e5"
-        android:textSize="13sp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="8dp"
-        android:layout_marginStart="30dp"
-        android:text="@string/location_settings_dialog_message_location_services_gps_and_nlp"
-        android:textColor="#e4e1e5"
-        android:textSize="13sp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="8dp"
-        android:layout_marginStart="30dp"
-        android:text="@string/location_settings_dialog_message_gls_consent"
-        android:textColor="#e4e1e5"
-        android:textSize="13sp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="10dp"
-        android:text="@string/location_settings_dialog_message_details_end_paragraph"
-        android:textColor="#e4e1e5"
-        android:textSize="13sp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:layout_marginEnd="10dp"
-        android:layout_marginBottom="24dp"
-        android:gravity="right"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/location_setting_checker_cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/location_settings_dialog_btn_cancel"
-            android:textColor="#c0c1fa"
-            android:textSize="13sp"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/location_setting_checker_sure"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
-            android:text="@string/location_settings_dialog_btn_sure"
-            android:textColor="#c0c1fa"
-            android:textSize="13sp"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/play-services-location/core/src/main/res/layout/location_settings_dialog.xml b/play-services-location/core/src/main/res/layout/location_settings_dialog.xml
new file mode 100644
index 00000000..125d3fe3
--- /dev/null
+++ b/play-services-location/core/src/main/res/layout/location_settings_dialog.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ SPDX-FileCopyrightText: 2024 microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_weight="1"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginBottom="16dp">
+
+        <TextView
+            android:id="@+id/message_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:visibility="gone"
+            android:textStyle="bold"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp"
+            style="?android:textAppearanceMedium" />
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp"
+            android:text="@string/location_settings_dialog_message_title_to_continue"
+            style="?android:attr/textAppearanceMedium" />
+
+        <LinearLayout
+            android:id="@+id/messages"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="24dp"
+            android:paddingRight="24dp">
+
+            <TextView
+                android:layout_gravity="top"
+                android:id="@+id/details_start"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/location_settings_dialog_message_details_start_paragraph" />
+
+            <TextView
+                android:layout_gravity="bottom"
+                android:id="@+id/details_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/location_settings_dialog_message_details_end_paragraph" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/play-services-location/core/src/main/res/layout/location_settings_dialog_item.xml b/play-services-location/core/src/main/res/layout/location_settings_dialog_item.xml
new file mode 100644
index 00000000..1e77073e
--- /dev/null
+++ b/play-services-location/core/src/main/res/layout/location_settings_dialog_item.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ SPDX-FileCopyrightText: 2024 microG Project Team
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dp">
+
+    <ImageView
+        android:layout_gravity="top"
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="0dp"
+        android:paddingEnd="16dp" />
+
+    <TextView
+        android:layout_gravity="top"
+        android:id="@android:id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/play-services-location/core/src/main/res/values/strings.xml b/play-services-location/core/src/main/res/values/strings.xml
index 6bb75c0f..fc3074d3 100644
--- a/play-services-location/core/src/main/res/values/strings.xml
+++ b/play-services-location/core/src/main/res/values/strings.xml
@@ -28,12 +28,13 @@
     <string name="pref_location_app_force_coarse_title">Force coarse location</string>
     <string name="pref_location_app_force_coarse_summary">Always return coarse locations to this app, ignoring its permission level.</string>
 
-    <string name="location_settings_dialog_message_title_to_continue">To continue, turn on device location, which uses location service</string>
+    <string name="location_settings_dialog_message_title_for_better_experience">For better experience, turn on device location, which uses microG\'s location service</string>
+    <string name="location_settings_dialog_message_title_to_continue">To continue, turn on device location, which uses microG\'s location service</string>
     <string name="location_settings_dialog_message_details_start_paragraph">Your device will need to:</string>
     <string name="location_settings_dialog_message_location_services_gps_and_nlp">Use GPS, Wi‑Fi, cell networks, and sensors</string>
-    <string name="location_settings_dialog_message_gls_consent">Use location service; as part of this service, may collect location data periodically and use this data in an anonymous way to improve location accuracy and location-based services.</string>
+    <string name="location_settings_dialog_message_gls_consent">Use microG location service; as part of this service, microG may collect location data periodically and use this data in an anonymous way to improve location accuracy and location-based services.</string>
     <string name="location_settings_dialog_message_details_end_paragraph">For details, go to the location settings.</string>
-    <string name="location_settings_dialog_btn_cancel">No,thanks</string>
+    <string name="location_settings_dialog_btn_cancel">No thanks</string>
     <string name="location_settings_dialog_btn_sure">OK</string>
 
 </resources>
\ No newline at end of file
diff --git a/play-services-location/core/src/main/res/values/styles.xml b/play-services-location/core/src/main/res/values/styles.xml
deleted file mode 100644
index 98bbf26a..00000000
--- a/play-services-location/core/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AlertThemeSelector" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="android:windowBackground">@drawable/custom_dialog_background</item>
-        <item name="android:windowMinWidthMajor">85%</item>
-        <item name="android:windowMinWidthMinor">85%</item>
-        <item name="android:windowCloseOnTouchOutside">false</item>
-    </style>
-</resources>
\ No newline at end of file