diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 01480f83523..220c9c3fed9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -48,7 +48,8 @@
 
         <!-- Settings -->
 
-        <activity android:name="Settings" android:label="@string/settings_label"
+        <activity android:name="Settings"
+                android:label="@string/settings_label_launcher"
                 android:taskAffinity="com.android.settings"
                 android:clearTaskOnLaunch="true"
                 android:launchMode="singleTop">
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f1d25e348c9..fbf0e00500b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -467,8 +467,10 @@
     <!-- Button label for generic cancel action -->
     <string name="cancel">Cancel</string>
 
-    <!-- Main Settings screen title -->
+    <!-- Title of the Settings activity shown within the application itself. -->
     <string name="settings_label">Settings</string>
+    <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
+    <string name="settings_label_launcher">Settings</string>
     <!-- Label for option to select a settings panel as a shortcut -->
     <string name="settings_shortcut">Settings</string>
     <!-- Wireless controls settings screen, setting check box label -->