diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eebaa7c..f93e696 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -105,7 +105,6 @@
         <activity-alias
             android:name=".input.ButtonSettings"
             android:label="@string/button_pref_title"
-            android:icon="@drawable/ic_settings_buttons"
             android:targetActivity="PartsActivity">
             <intent-filter>
                 <action android:name="com.android.settings.action.IA_SETTINGS" />
@@ -116,6 +115,12 @@
                 android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.system" />
             <meta-data
+                android:name="com.android.settings.icon"
+                android:resource="@drawable/ic_settings_buttons" />
+            <meta-data
+                android:name="com.android.settings.icon_tintable"
+                android:value="true" />
+            <meta-data
                 android:name="com.android.settings.order"
                 android:value="-256" />
             <meta-data
@@ -129,7 +134,6 @@
         <activity-alias
             android:name=".profiles.ProfilesSettings"
             android:label="@string/profiles_settings_title"
-            android:icon="@drawable/ic_settings_profiles"
             android:targetActivity="PartsActivity">
             <intent-filter>
                 <action android:name="com.android.settings.action.IA_SETTINGS" />
@@ -140,6 +144,12 @@
                 android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.system" />
             <meta-data
+                android:name="com.android.settings.icon"
+                android:resource="@drawable/ic_settings_profiles" />
+            <meta-data
+                android:name="com.android.settings.icon_tintable"
+                android:value="true" />
+            <meta-data
                 android:name="com.android.settings.order"
                 android:value="-255" />
             <meta-data
@@ -151,7 +161,6 @@
         <activity-alias
             android:name=".statusbar.StatusBarSettings"
             android:label="@string/status_bar_title"
-            android:icon="@drawable/ic_settings_statusbar"
             android:targetActivity="PartsActivity">
             <intent-filter>
                 <action android:name="com.android.settings.action.IA_SETTINGS" />
@@ -162,6 +171,12 @@
                 android:name="com.android.settings.category"
                 android:value="com.android.settings.category.ia.system" />
             <meta-data
+                android:name="com.android.settings.icon"
+                android:resource="@drawable/ic_settings_statusbar" />
+            <meta-data
+                android:name="com.android.settings.icon_tintable"
+                android:value="true" />
+            <meta-data
                 android:name="com.android.settings.order"
                 android:value="-254" />
             <meta-data