diff --git a/play-services-core/src/main/res/xml/preferences_account.xml b/play-services-core/src/main/res/xml/preferences_account.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/xml/preferences_auth.xml b/play-services-core/src/main/res/xml/preferences_auth.xml
old mode 100644
new mode 100755
index f3d707b1..7ff14e56
--- a/play-services-core/src/main/res/xml/preferences_auth.xml
+++ b/play-services-core/src/main/res/xml/preferences_auth.xml
@@ -18,16 +18,16 @@
     <PreferenceScreen
         android:key="k2"
         android:title="@string/prefs_account_security">
-        <intent android:action="com.google.android.gms.accountsettings.SECURITY_SETTINGS"/>
+        <intent android:action="com.mgoogle.android.gms.accountsettings.SECURITY_SETTINGS"/>
     </PreferenceScreen>
     <PreferenceScreen
         android:key="k3"
         android:title="@string/prefs_account_privacy">
-        <intent android:action="com.google.android.gms.accountsettings.PRIVACY_SETTINGS"/>
+        <intent android:action="com.mgoogle.android.gms.accountsettings.PRIVACY_SETTINGS"/>
     </PreferenceScreen>
     <PreferenceScreen
         android:key="k4"
         android:title="@string/prefs_account">
-        <intent android:action="com.google.android.gms.accountsettings.ACCOUNT_PREFERENCES_SETTINGS"/>
+        <intent android:action="com.mgoogle.android.gms.accountsettings.ACCOUNT_PREFERENCES_SETTINGS"/>
     </PreferenceScreen>
 </PreferenceScreen>
diff --git a/play-services-core/src/main/res/xml/preferences_gcm.xml b/play-services-core/src/main/res/xml/preferences_gcm.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml b/play-services-core/src/main/res/xml/preferences_gcm_advanced.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/xml/preferences_google_more.xml b/play-services-core/src/main/res/xml/preferences_google_more.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/xml/preferences_start.xml b/play-services-core/src/main/res/xml/preferences_start.xml
old mode 100644
new mode 100755
index c08f2f62..9501282c
--- a/play-services-core/src/main/res/xml/preferences_start.xml
+++ b/play-services-core/src/main/res/xml/preferences_start.xml
@@ -14,40 +14,39 @@
   ~ limitations under the License.
   -->
 
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory android:title="@string/prefcat_google_services">
-        <org.microg.tools.ui.TintIconPreference
+        <Preference
             android:icon="@drawable/ic_add_account"
             android:summary="@string/pref_add_account_summary"
             android:title="@string/pref_add_account_title">
             <intent
                 android:targetClass="org.microg.gms.auth.login.LoginActivity"
-                android:targetPackage="com.mgoogle.android.gms"/>
-        </org.microg.tools.ui.TintIconPreference>
-        <org.microg.tools.ui.TintIconPreference
+                android:targetPackage="com.mgoogle.android.gms" />
+        </Preference>
+        <Preference
             android:icon="@drawable/ic_device_login"
             android:key="pref_checkin"
-            android:title="@string/service_name_checkin">
-            <intent
-                android:targetClass="org.microg.gms.ui.CheckinFragment$AsActivity"
-                android:targetPackage="com.mgoogle.android.gms"/>
-        </org.microg.tools.ui.TintIconPreference>
-        <org.microg.tools.ui.TintIconPreference
+            android:title="@string/service_name_checkin" />
+        <Preference
             android:icon="@drawable/ic_cloud_bell"
             android:key="pref_gcm"
-            android:title="@string/service_name_mcs">
+            android:title="@string/service_name_mcs" />
+        <Preference
+            android:icon="@drawable/dots_horizontal"
+            android:key="pref_google_more"
+            android:title="@string/pref_more_settings"
+            app:isPreferenceVisible="false">
             <intent
-                android:targetClass="org.microg.gms.ui.GcmFragment$AsActivity"
-                android:targetPackage="com.mgoogle.android.gms"/>
-        </org.microg.tools.ui.TintIconPreference>
+                android:targetClass="org.microg.gms.ui.GoogleMoreFragment$AsActivity"
+                android:targetPackage="com.mgoogle.android.gms" />
+        </Preference>
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/prefcat_about">
-        <org.microg.tools.ui.TintIconPreference
+    <PreferenceCategory android:layout="@layout/preference_category_no_label">
+        <Preference
+            android:icon="@drawable/ic_info_outline"
             android:key="pref_about"
-            android:title="@string/pref_about_title">
-            <intent
-                android:targetClass="org.microg.gms.ui.AboutFragment$AsActivity"
-                android:targetPackage="com.mgoogle.android.gms"/>
-        </org.microg.tools.ui.TintIconPreference>
+            android:title="@string/pref_about_title" />
     </PreferenceCategory>
 </PreferenceScreen>