diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 04314394b5..d062314e11 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -360,13 +360,11 @@
         <!-- microG Settings activity -->
         <activity
             android:name="org.microg.gms.ui.MainSettingsActivity"
-            android:icon="@mipmap/ic_launcher"
+            android:enabled="false"
             android:process=":ui"
-            android:roundIcon="@mipmap/ic_launcher_round"
             android:taskAffinity="org.microg.gms.settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -374,21 +372,20 @@
         <!-- Allow microG Settings from opening by other applications -->
         <activity-alias
             android:name="org.microg.gms.ui.SettingsActivity"
-            android:icon="@mipmap/ic_launcher"
             android:label="@string/gms_settings_name"
-            android:roundIcon="@mipmap/ic_launcher_round"
             android:process=":ui"
             android:targetActivity="org.microg.gms.ui.MainSettingsActivity"
             android:taskAffinity="org.microg.gms.settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
             </intent-filter>
         </activity-alias>
 
         <activity
             android:name="org.microg.gms.ui.SettingsDashboardActivity"
             android:icon="@mipmap/ic_launcher"
-            android:label="Legacy microG Settings"
+            android:label="@string/gms_settings_name"
             android:process=":ui"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:taskAffinity="org.microg.gms.settings" />
@@ -397,7 +394,7 @@
         <activity-alias
             android:name="org.microg.gms.ui.SettingsActivityLink"
             android:icon="@mipmap/ic_launcher"
-            android:label="@string/gms_settings_name"
+            android:label="@string/gms_app_name"
             android:process=":ui"
             android:targetActivity="org.microg.gms.ui.MainSettingsActivity"
             android:taskAffinity="org.microg.gms.settings">
diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml
index eee6c7478c..5d19e37cd7 100644
--- a/play-services-core/src/main/res/xml/preferences_start.xml
+++ b/play-services-core/src/main/res/xml/preferences_start.xml
@@ -41,7 +41,7 @@
             android:title="@string/service_name_mcs" />
 
         <SwitchPreferenceCompat
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:icon="@drawable/ic_hide_launcher_icon"
             android:key="pref_hide_launcher_icon"
             android:title="@string/pref_hide_launcher_icon" />