diff --git a/api/cm_current.txt b/api/cm_current.txt
index c2e5a0ea..3d85c5be 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -1129,6 +1129,7 @@ package cyanogenmod.providers {
     field public static final java.lang.String STATUS_BAR_QUICK_QS_PULLDOWN = "qs_quick_pulldown";
     field public static final java.lang.String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";
     field public static final java.lang.String STATUS_BAR_SHOW_WEATHER = "status_bar_show_weather";
+    field public static final java.lang.String STYLUS_ICON_ENABLED = "stylus_icon_enabled";
     field public static final java.lang.String SWAP_VOLUME_KEYS_ON_ROTATION = "swap_volume_keys_on_rotation";
     field public static final java.lang.String SYSTEM_PROFILES_ENABLED = "system_profiles_enabled";
     field public static final java.lang.String SYS_PROP_CM_SETTING_VERSION = "sys.cm_settings_system_version";
diff --git a/host/migration/example-cm12.1-settings.txt b/host/migration/example-cm12.1-settings.txt
index 7534be30..2db59610 100644
--- a/host/migration/example-cm12.1-settings.txt
+++ b/host/migration/example-cm12.1-settings.txt
@@ -60,6 +60,7 @@ Row: 56 name=camera_wake_screen, type=s, value=0, type=s
 Row: 57 name=volume_wake_screen, type=s, value=0, type=s
 Row: 58 name=volbtn_music_controls, type=s, value=1, type=s
 Row: 59 name=volume_keys_control_ring_stream, type=s, value=1, type=s
+Row: 60 name=stylus_icon_enabled, type=s, value=1, type=s
 Row: 60 name=swap_volume_keys_on_rotation, type=s, value=0, type=s
 Row: 61 name=status_bar_brightness_control, type=s, value=0, type=s
 Row: 62 name=status_bar_notif_count, type=s, value=1, type=s
diff --git a/host/migration/src/CMSettings.java b/host/migration/src/CMSettings.java
index 07ef080b..98e31940 100644
--- a/host/migration/src/CMSettings.java
+++ b/host/migration/src/CMSettings.java
@@ -267,6 +267,13 @@ public final class CMSettings {
          */
         public static final String CAMERA_LAUNCH = "camera_launch";
 
+        /**
+         * Show icon when stylus is used
+         * The value is boolean (1 or 0).
+         * @hide
+         */
+        public static final String STYLUS_ICON_ENABLED = "stylus_icon_enabled";
+
         /**
          * Swap volume buttons when the screen is rotated
          * 0 - Disabled
@@ -660,6 +667,7 @@ public final class CMSettings {
                 CMSettings.System.CAMERA_WAKE_SCREEN,
                 CMSettings.System.CAMERA_SLEEP_ON_RELEASE,
                 CMSettings.System.CAMERA_LAUNCH,
+                CMSettings.System.STYLUS_ICON_ENABLED,
                 CMSettings.System.SWAP_VOLUME_KEYS_ON_ROTATION,
                 CMSettings.System.BATTERY_LIGHT_ENABLED,
                 CMSettings.System.BATTERY_LIGHT_PULSE,
diff --git a/sdk/src/java/cyanogenmod/providers/CMSettings.java b/sdk/src/java/cyanogenmod/providers/CMSettings.java
index 3100546b..2868b3a5 100644
--- a/sdk/src/java/cyanogenmod/providers/CMSettings.java
+++ b/sdk/src/java/cyanogenmod/providers/CMSettings.java
@@ -1153,6 +1153,16 @@ public final class CMSettings {
         public static final Validator CAMERA_LAUNCH_VALIDATOR =
                 sBooleanValidator;
 
+        /**
+         * Show icon when stylus is used
+         * The value is boolean (1 or 0).
+         */
+        public static final String STYLUS_ICON_ENABLED = "stylus_icon_enabled";
+
+        /** @hide */
+        public static final Validator STYLUS_ICON_ENABLED_VALIDATOR =
+                sBooleanValidator;
+
         /**
          * Swap volume buttons when the screen is rotated
          * 0 - Disabled
@@ -1884,6 +1894,7 @@ public final class CMSettings {
                 CMSettings.System.CAMERA_WAKE_SCREEN,
                 CMSettings.System.CAMERA_SLEEP_ON_RELEASE,
                 CMSettings.System.CAMERA_LAUNCH,
+                CMSettings.System.STYLUS_ICON_ENABLED,
                 CMSettings.System.SWAP_VOLUME_KEYS_ON_ROTATION,
                 CMSettings.System.BATTERY_LIGHT_ENABLED,
                 CMSettings.System.BATTERY_LIGHT_PULSE,
@@ -2028,6 +2039,7 @@ public final class CMSettings {
             VALIDATORS.put(CAMERA_WAKE_SCREEN, CAMERA_WAKE_SCREEN_VALIDATOR);
             VALIDATORS.put(CAMERA_SLEEP_ON_RELEASE, CAMERA_SLEEP_ON_RELEASE_VALIDATOR);
             VALIDATORS.put(CAMERA_LAUNCH, CAMERA_LAUNCH_VALIDATOR);
+            VALIDATORS.put(STYLUS_ICON_ENABLED, STYLUS_ICON_ENABLED_VALIDATOR);
             VALIDATORS.put(SWAP_VOLUME_KEYS_ON_ROTATION,
                     SWAP_VOLUME_KEYS_ON_ROTATION_VALIDATOR);
             VALIDATORS.put(BATTERY_LIGHT_ENABLED, BATTERY_LIGHT_ENABLED_VALIDATOR);