diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 80b1b7ab..de35ffd4 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -405,9 +405,11 @@
 
         <!-- microG custom UI -->
 
+        <!-- microG Settings shown in Launcher -->
         <activity
             android:name="org.microg.gms.ui.SettingsActivity"
             android:icon="@mipmap/ic_microg_settings"
+            android:roundIcon="@mipmap/ic_microg_settings"
             android:label="@string/gms_settings_name"
             android:theme="@style/Theme.AppCompat.Settings.Dashboard">
             <intent-filter>
@@ -415,8 +417,27 @@
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
         </activity>
 
+        <!-- microG Settings embedded in System Settings on SDK 23 and newer -->
+        <activity-alias
+            android:name="org.microg.gms.ui.SettingsActivityLink"
+            android:targetActivity="org.microg.gms.ui.SettingsActivity"
+            android:icon="@drawable/microg_light_color_24"
+            android:label="@string/gms_settings_name"
+            android:theme="@style/Theme.AppCompat.Settings.Dashboard">
+            <intent-filter>
+                <action android:name="com.android.settings.action.EXTRA_SETTINGS"/>
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category" android:value="com.android.settings.category.device"/>
+            <meta-data android:name="com.android.settings.icon" android:resource="@drawable/microg_light_color_24"/>
+            <meta-data android:name="com.android.settings.summary" android:resource="@string/gms_settings_summary"/>
+        </activity-alias>
+
         <activity
             android:name="org.microg.gms.ui.AskPushPermission"
             android:excludeFromRecents="true"
diff --git a/play-services-core/src/main/res/drawable-anydpi-v21/microg_light_color_24.xml b/play-services-core/src/main/res/drawable-anydpi-v21/microg_light_color_24.xml
new file mode 100644
index 00000000..5d62e2e4
--- /dev/null
+++ b/play-services-core/src/main/res/drawable-anydpi-v21/microg_light_color_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="256"
+    android:viewportHeight="256"
+    android:width="256dp"
+    android:height="256dp">
+    <path
+        android:fillColor="#ffffffff" android:pathData="M207.03481 139.53168c0.42667 -3.41333 0.74667 -6.82666 0.74667 -10.45333 0 -3.62667 -0.32 -7.04 -0.74667 -10.45333l22.50667 -17.6c2.02667 -1.599996 2.56 -4.479996 1.28 -6.826666L209.48815 57.291687c-1.28 -2.346666 -4.16 -3.2 -6.50667 -2.346666l-26.56 10.666666c-5.54667 -4.266666 -11.52 -7.786666 -18.02667 -10.453333l-4.05333 -28.266667c-0.32 -2.56 -2.56 -4.48 -5.22667 -4.48h-42.66666c-2.66667 0 -4.90667 1.92 -5.22667 4.48l-4.053331 28.266667c-6.50667 2.666667 -12.48 6.293333 -18.02667 10.453333l-26.56 -10.666666c-2.45333 -0.96 -5.22667 0 -6.50667 2.346666l-21.33333 36.906667c-1.38667 2.34667 -0.74667 5.22667 1.28 6.826666l22.50667 17.6c-0.42667 3.41333 -0.74667 6.93333 -0.74667 10.45333 0 3.52 0.32 7.04 0.74667 10.45333l-22.50667 17.6c-2.02667 1.6 -2.56 4.48 -1.28 6.82667l21.33333 36.90667c1.28 2.34666 4.16 3.2 6.50667 2.34666l26.56 -10.66666c5.54667 4.26666 11.52 7.78666 18.02667 10.45333l4.053331 28.26667c0.32 2.56 2.56 4.48 5.22667 4.48h42.66666c2.66667 0 4.90667 -1.92 5.22667 -4.48l4.05333 -28.26667c6.50667 -2.66667 12.48 -6.29333 18.02667 -10.45333l26.56 10.66666c2.45333 0.96 5.22667 0 6.50667 -2.34666l21.33333 -36.90667c1.28 -2.34667 0.74667 -5.22667 -1.28 -6.82667z">
+    </path>
+</vector>
diff --git a/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml b/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml
new file mode 100644
index 00000000..bcdc5a25
--- /dev/null
+++ b/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_microg_background" />
+    <foreground android:drawable="@mipmap/ic_microg_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png
new file mode 100644
index 00000000..503ae018
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png differ
diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png
new file mode 100644
index 00000000..9087dc6f
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png differ
diff --git a/play-services-core/src/main/res/mipmap-mdpi/ic_microg_background.png b/play-services-core/src/main/res/mipmap-mdpi/ic_microg_background.png
new file mode 100644
index 00000000..5357a91e
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-mdpi/ic_microg_background.png differ
diff --git a/play-services-core/src/main/res/mipmap-mdpi/ic_microg_foreground.png b/play-services-core/src/main/res/mipmap-mdpi/ic_microg_foreground.png
new file mode 100644
index 00000000..808b2724
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-mdpi/ic_microg_foreground.png differ
diff --git a/play-services-core/src/main/res/mipmap-xhdpi/ic_microg_background.png b/play-services-core/src/main/res/mipmap-xhdpi/ic_microg_background.png
new file mode 100644
index 00000000..f1688954
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-xhdpi/ic_microg_background.png differ
diff --git a/play-services-core/src/main/res/mipmap-xhdpi/ic_microg_foreground.png b/play-services-core/src/main/res/mipmap-xhdpi/ic_microg_foreground.png
new file mode 100644
index 00000000..d4d566bf
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-xhdpi/ic_microg_foreground.png differ
diff --git a/play-services-core/src/main/res/mipmap-xxhdpi/ic_microg_background.png b/play-services-core/src/main/res/mipmap-xxhdpi/ic_microg_background.png
new file mode 100644
index 00000000..f076fd00
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-xxhdpi/ic_microg_background.png differ
diff --git a/play-services-core/src/main/res/mipmap-xxhdpi/ic_microg_foreground.png b/play-services-core/src/main/res/mipmap-xxhdpi/ic_microg_foreground.png
new file mode 100644
index 00000000..e6271986
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-xxhdpi/ic_microg_foreground.png differ
diff --git a/play-services-core/src/main/res/mipmap-xxxhdpi/ic_microg_background.png b/play-services-core/src/main/res/mipmap-xxxhdpi/ic_microg_background.png
new file mode 100644
index 00000000..accd2095
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-xxxhdpi/ic_microg_background.png differ
diff --git a/play-services-core/src/main/res/mipmap-xxxhdpi/ic_microg_foreground.png b/play-services-core/src/main/res/mipmap-xxxhdpi/ic_microg_foreground.png
new file mode 100644
index 00000000..fccadcef
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-xxxhdpi/ic_microg_foreground.png differ
diff --git a/play-services-core/src/main/res/values-de/strings.xml b/play-services-core/src/main/res/values-de/strings.xml
index 88d84fbc..705bcb14 100644
--- a/play-services-core/src/main/res/values-de/strings.xml
+++ b/play-services-core/src/main/res/values-de/strings.xml
@@ -17,6 +17,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="gms_app_name">microG Services Core</string>
     <string name="gms_settings_name">microG Einstellungen</string>
+    <string name="gms_settings_summary">microG services Core einrichten.</string>
 
     <string name="just_a_sec">Einen kurzen Moment…</string>
     <string name="google_account_label">Google</string>
diff --git a/play-services-core/src/main/res/values-ru/strings.xml b/play-services-core/src/main/res/values-ru/strings.xml
index b6b3721c..f5b7d21f 100644
--- a/play-services-core/src/main/res/values-ru/strings.xml
+++ b/play-services-core/src/main/res/values-ru/strings.xml
@@ -16,7 +16,8 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="gms_app_name">microG Services Core</string>
-    <string name="gms_settings_name">MicroG</string>
+    <string name="gms_settings_name">Настройки MicroG</string>
+    <string name="gms_settings_summary">Конфигурирование сервисов microG.</string>
 
     <string name="just_a_sec">Пожалуйста, подождите...</string>
     <string name="google_account_label">Google</string>
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index c0a25123..2b3cc7fa 100644
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="gms_app_name">microG Services Core</string>
     <string name="gms_settings_name">microG Settings</string>
+    <string name="gms_settings_summary">Setup microG services Core.</string>
 
     <string name="just_a_sec">Just a sec…</string>
     <string name="google_account_label">Google</string>