diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dba419a..b8a993a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <!--
 /**
  * Copyright 2016, The CyanogenMod Project
- * Copyright 2017-2018, The LineageOS Project
+ * Copyright 2017-2019, The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,8 +106,8 @@
             android:name=".livedisplay.LiveDisplaySettings"
             android:label="@*lineageos.platform:string/live_display_title"
             android:targetActivity="PartsActivity">
-            <intent-filter android:priority="-2">
-                <action android:name="org.lineageos.lineageparts.action.SETTINGS" />
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
                 <action android:name="org.lineageos.lineageparts.LIVEDISPLAY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -115,6 +115,9 @@
                 android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.display" />
             <meta-data
+                android:name="com.android.settings.order"
+                android:value="2" />
+            <meta-data
                 android:name="com.android.settings.summary"
                 android:resource="@string/live_display_summary" />
         </activity-alias>
@@ -125,8 +128,8 @@
             android:label="@string/button_pref_title"
             android:icon="@drawable/ic_settings_buttons"
             android:targetActivity="PartsActivity">
-            <intent-filter android:priority="256">
-                <action android:name="org.lineageos.lineageparts.action.SETTINGS" />
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
                 <action android:name="org.lineageos.lineageparts.BUTTON_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -134,8 +137,11 @@
                 android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.system" />
             <meta-data
+                android:name="com.android.settings.order"
+                android:value="-256" />
+            <meta-data
                 android:name="com.android.settings.summary"
-                android:value="@string/summary_empty" />
+                android:resource="@string/summary_empty" />
         </activity-alias>
 
         <activity android:name=".gestures.KeyHandler" />
@@ -146,8 +152,8 @@
             android:label="@string/profiles_settings_title"
             android:icon="@drawable/ic_settings_profiles"
             android:targetActivity="PartsActivity">
-            <intent-filter android:priority="255">
-                <action android:name="org.lineageos.lineageparts.action.SETTINGS" />
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
                 <action android:name="org.lineageos.lineageparts.PROFILES_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -155,6 +161,9 @@
                 android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.system" />
             <meta-data
+                android:name="com.android.settings.order"
+                android:value="-255" />
+            <meta-data
                 android:name="com.android.settings.summary"
                 android:resource="@string/summary_empty" />
         </activity-alias>
@@ -165,8 +174,8 @@
             android:label="@string/status_bar_title"
             android:icon="@drawable/ic_settings_statusbar"
             android:targetActivity="PartsActivity">
-            <intent-filter android:priority="254">
-                <action android:name="org.lineageos.lineageparts.action.SETTINGS" />
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
                 <action android:name="org.lineageos.lineageparts.STATUS_BAR_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -174,6 +183,9 @@
                 android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.system" />
             <meta-data
+                android:name="com.android.settings.order"
+                android:value="-254" />
+            <meta-data
                 android:name="com.android.settings.summary"
                 android:resource="@string/summary_empty" />
         </activity-alias>
@@ -183,8 +195,8 @@
             android:name=".style.StylePreferences"
             android:label="@string/style_title"
             android:targetActivity="PartsActivity">
-            <intent-filter android:priority="-3">
-                <action android:name="org.lineageos.lineageparts.action.SETTINGS" />
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
                 <action android:name="org.lineageos.lineageparts.STYLE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -192,20 +204,32 @@
                 android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.display" />
             <meta-data
+                android:name="com.android.settings.order"
+                android:value="3" />
+            <meta-data
                 android:name="com.android.settings.summary"
                 android:resource="@string/style_summary" />
         </activity-alias>
 
-        <!-- Trust interface (Security category) -->
+        <!-- Trust interface (Privacy category) -->
         <activity-alias
             android:name=".trust.TrustPreferences"
             android:label="@string/trust_title"
             android:targetActivity="PartsActivity">
-            <intent-filter android:priority="-4">
-                <action android:name="org.lineageos.lineageparts.action.SETTINGS" />
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
                 <action android:name="org.lineageos.lineageparts.TRUST_INTERFACE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <meta-data
+                android:name="com.android.settings.category"
+                android:value="com.android.settings.category.ia.privacy" />
+            <meta-data
+                android:name="com.android.settings.order"
+                android:value="0" />
+            <meta-data
+                android:name="com.android.settings.summary"
+                android:resource="@string/summary_empty" />
         </activity-alias>
 
         <!-- Expanded Desktop settings (Display category) -->
@@ -213,8 +237,8 @@
             android:name=".applications.ExpandedDesktopSettings"
             android:label="@string/expanded_desktop_settings_title"
             android:targetActivity="PartsActivity">
-            <intent-filter android:priority="-9">
-                <action android:name="org.lineageos.lineageparts.action.SETTINGS" />
+            <intent-filter>
+                <action android:name="com.android.settings.action.IA_SETTINGS" />
                 <action android:name="org.lineageos.lineageparts.EXPANDED_DESKTOP_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -222,6 +246,9 @@
                 android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.display" />
             <meta-data
+                android:name="com.android.settings.order"
+                android:value="13" />
+            <meta-data
                 android:name="com.android.settings.summary"
                 android:resource="@string/expanded_desktop_settings_summary" />
         </activity-alias>