diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad38a9899efa08022da9626fbd22eb741f7ae87b..bc2db4efad5203ebe477061fbfb31627bd44f6ba 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3409,22 +3409,6 @@
                  android:permission="android.permission.BIND_JOB_SERVICE" />
 
 	<!-- /e/ specific changes -->
-        <activity android:name="Settings$MicroGActivity"
-            android:label="@string/micro_g"
-            android:icon="@drawable/ic_homepage_microg">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.MICROG_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter android:priority="-1">
-                <action android:name="com.android.settings.action.SETTINGS" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.category"
-                android:value="com.android.settings.category.ia.homepage" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.MicroGSettings" />
-        </activity>
-
         <activity android:name="Settings$OpenKeychainActivity"
             android:label="@string/open_keychain"
             android:icon="@drawable/ic_homepage_openkeychain">
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 969335cf60d8ccbaa784fe4614f082574708b289..3c66cddd3fb98934aa98d4d7fc9b71459dc53207 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -22,6 +22,18 @@
     android:title="@string/header_category_system"
     settings:initialExpandedChildrenCount="4">
 
+    <Preference
+        android:key="microg_settings"
+        android:title="@string/micro_g"
+        android:icon="@drawable/ic_microg_settings"
+        android:order="-252"
+        android:fragment="com.android.settings.MicroGSettings">
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.google.android.gms"
+            android:targetClass="org.microg.gms.ui.SettingsActivity" />
+    </Preference>
+
+
     <Preference
         android:key="gesture_settings"
         android:title="@string/gesture_preference_title"
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index b5bbec37fb3fb67bbebc2f5ef9bb37bf7b833262..de787ac655f1e507eeea50037ec645e9af81badd 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -266,7 +266,6 @@ public class SettingsGateway {
             DirectoryAccessDetails.class.getName(),
             ToggleBackupSettingFragment.class.getName(),
             PreviouslyConnectedDeviceDashboardFragment.class.getName(),
-            MicroGSettings.class.getName(),
             OpenKeychainSettings.class.getName(),
             SystemUpdaterSettings.class.getName(),
     };
@@ -284,7 +283,6 @@ public class SettingsGateway {
             Settings.SecurityDashboardActivity.class.getName(),
             Settings.AccessibilitySettingsActivity.class.getName(),
             Settings.SystemDashboardActivity.class.getName(),
-	    // Settings.MicroGActivity.class.getName(),
             SupportDashboardActivity.class.getName(),
             // Home page > Network & Internet
             Settings.WifiSettingsActivity.class.getName(),