diff --git a/res/mipmap-hdpi/ic_accessibility_generic.png b/res/mipmap-hdpi/ic_accessibility_generic.png
new file mode 100755
index 00000000000..e54166b8ccc
Binary files /dev/null and b/res/mipmap-hdpi/ic_accessibility_generic.png differ
diff --git a/res/mipmap-hdpi/ic_accessibility_magnification.png b/res/mipmap-hdpi/ic_accessibility_magnification.png
new file mode 100755
index 00000000000..a91bc6ec90e
Binary files /dev/null and b/res/mipmap-hdpi/ic_accessibility_magnification.png differ
diff --git a/res/mipmap-mdpi/ic_accessibility_generic.png b/res/mipmap-mdpi/ic_accessibility_generic.png
new file mode 100755
index 00000000000..77dc47bb917
Binary files /dev/null and b/res/mipmap-mdpi/ic_accessibility_generic.png differ
diff --git a/res/mipmap-mdpi/ic_accessibility_magnification.png b/res/mipmap-mdpi/ic_accessibility_magnification.png
new file mode 100755
index 00000000000..9ec51075a5e
Binary files /dev/null and b/res/mipmap-mdpi/ic_accessibility_magnification.png differ
diff --git a/res/mipmap-xhdpi/ic_accessibility_generic.png b/res/mipmap-xhdpi/ic_accessibility_generic.png
new file mode 100755
index 00000000000..1152c424f85
Binary files /dev/null and b/res/mipmap-xhdpi/ic_accessibility_generic.png differ
diff --git a/res/mipmap-xhdpi/ic_accessibility_magnification.png b/res/mipmap-xhdpi/ic_accessibility_magnification.png
new file mode 100755
index 00000000000..0b3a32ed179
Binary files /dev/null and b/res/mipmap-xhdpi/ic_accessibility_magnification.png differ
diff --git a/res/mipmap-xxhdpi/ic_accessibility_generic.png b/res/mipmap-xxhdpi/ic_accessibility_generic.png
new file mode 100755
index 00000000000..48f39c2d600
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_accessibility_generic.png differ
diff --git a/res/mipmap-xxhdpi/ic_accessibility_magnification.png b/res/mipmap-xxhdpi/ic_accessibility_magnification.png
new file mode 100755
index 00000000000..3eeb1c9f8dd
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_accessibility_magnification.png differ
diff --git a/res/mipmap-xxxhdpi/ic_accessibility_generic.png b/res/mipmap-xxxhdpi/ic_accessibility_generic.png
new file mode 100755
index 00000000000..e9ca8793e73
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_accessibility_generic.png differ
diff --git a/res/mipmap-xxxhdpi/ic_accessibility_magnification.png b/res/mipmap-xxxhdpi/ic_accessibility_magnification.png
new file mode 100755
index 00000000000..7d376126b4d
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_accessibility_magnification.png differ
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 48e11afe336..795d35e9810 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -54,7 +54,8 @@
         <Preference
             android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
             android:key="magnification_preference_screen"
-            android:title="@string/accessibility_screen_magnification_title"/>
+            android:title="@string/accessibility_screen_magnification_title"
+            android:icon="@mipmap/ic_accessibility_magnification" />
 
         <Preference
                 android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 760755c774b..ac618d08be4 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -31,6 +31,7 @@ import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.preference.ListPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
@@ -76,11 +77,12 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
     private static final String CATEGORY_AUDIO_AND_CAPTIONS = "audio_and_captions_category";
     private static final String CATEGORY_DISPLAY = "display_category";
     private static final String CATEGORY_INTERACTION_CONTROL = "interaction_control_category";
+    private static final String CATEGORY_EXPERIMENTAL = "experimental_category";
     private static final String CATEGORY_DOWNLOADED_SERVICES = "user_installed_services_category";
 
     private static final String[] CATEGORIES = new String[] {
         CATEGORY_SCREEN_READER, CATEGORY_AUDIO_AND_CAPTIONS, CATEGORY_DISPLAY,
-        CATEGORY_INTERACTION_CONTROL, CATEGORY_DOWNLOADED_SERVICES
+        CATEGORY_INTERACTION_CONTROL, CATEGORY_EXPERIMENTAL, CATEGORY_DOWNLOADED_SERVICES
     };
 
     // Preferences
@@ -454,9 +456,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
                     new RestrictedPreference(downloadedServicesCategory.getContext());
             String title = info.getResolveInfo().loadLabel(getPackageManager()).toString();
 
-            Drawable icon = info.getResolveInfo().loadIcon(getPackageManager());
-            if (icon == null) {
-                // todo (saigem): add a default
+            Drawable icon;
+            if (info.getResolveInfo().getIconResource() == 0) {
+                icon = ContextCompat.getDrawable(getContext(), R.mipmap.ic_accessibility_generic);
+            } else {
+                icon = info.getResolveInfo().loadIcon(getPackageManager());
             }
 
             ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo;