diff --git a/res/values/strings.xml b/res/values/strings.xml
index e654480dcb0..bbe286cefcd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2042,8 +2042,6 @@
     <string name="title_font_size">Font size</string>
     <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
     <string name="summary_font_size" translatable="false">%1$s</string>
-    <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
-    <string name="dialog_title_font_size">Font size</string>
 
     <!-- SIM lock settings title  [CHAR LIMIT=40] -->
     <string name="sim_lock_settings">SIM card lock settings</string>
@@ -5604,8 +5602,6 @@
     <string name="global_change_warning" product="default">This setting affects all users on this phone.</string>
     <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
     <string name="global_locale_change_title">Change language</string>
-    <!-- Warning message title for global font change [CHAR LIMIT=40] -->
-    <string name="global_font_change_title">Change font size</string>
 
     <!-- NFC payment settings --><skip/>
     <string name="nfc_payment_settings_title">Tap &amp; pay</string>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index b5157e48bff..949c7ed3fc5 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -85,14 +85,13 @@
                 android:summary="@string/tap_to_wake_summary"
                 android:persistent="false" />
 
-        <com.android.settings.WarnedListPreference
+        <com.android.settings.DropDownPreference
                 android:key="font_size"
                 android:title="@string/title_font_size"
                 settings:keywords="@string/keywords_display_font_size"
                 android:summary="@string/summary_font_size"
                 android:entries="@array/entries_font_size"
-                android:entryValues="@array/entryvalues_font_size"
-                android:dialogTitle="@string/dialog_title_font_size" />
+                android:entryValues="@array/entryvalues_font_size" />
 
         <com.android.settings.DropDownPreference
                 android:key="auto_rotate"
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 275d465e6a7..cac8a6341a5 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -60,7 +60,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class DisplaySettings extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceChangeListener, OnPreferenceClickListener, Indexable {
+        Preference.OnPreferenceChangeListener, Indexable {
     private static final String TAG = "DisplaySettings";
 
     /** If there is no setting in the provider, use this. */
@@ -77,9 +77,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
     private static final String KEY_NIGHT_MODE = "night_mode";
     private static final String KEY_CAMERA_GESTURE = "camera_gesture";
 
-    private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
-
-    private WarnedListPreference mFontSizePref;
+    private DropDownPreference mFontSizePref;
 
     private final Configuration mCurConfig = new Configuration();
 
@@ -120,9 +118,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
         disableUnusableTimeouts(mScreenTimeoutPreference);
         updateTimeoutPreferenceDescription(currentTimeout);
 
-        mFontSizePref = (WarnedListPreference) findPreference(KEY_FONT_SIZE);
+        mFontSizePref = (DropDownPreference) findPreference(KEY_FONT_SIZE);
         mFontSizePref.setOnPreferenceChangeListener(this);
-        mFontSizePref.setOnPreferenceClickListener(this);
 
         if (isAutomaticBrightnessAvailable(getResources())) {
             mAutoBrightnessPreference = (SwitchPreference) findPreference(KEY_AUTO_BRIGHTNESS);
@@ -347,20 +344,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
         updateState();
     }
 
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        if (dialogId == DLG_GLOBAL_CHANGE_WARNING) {
-            return Utils.buildGlobalChangeWarningDialog(getActivity(),
-                    R.string.global_font_change_title,
-                    new Runnable() {
-                        public void run() {
-                            mFontSizePref.click();
-                        }
-                    });
-        }
-        return null;
-    }
-
     private void updateState() {
         readFontSizePreference(mFontSizePref);
         updateScreenSaverSummary();
@@ -468,19 +451,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
         return true;
     }
 
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (preference == mFontSizePref) {
-            if (Utils.hasMultipleUsers(getActivity())) {
-                showDialog(DLG_GLOBAL_CHANGE_WARNING);
-                return true;
-            } else {
-                mFontSizePref.click();
-            }
-        }
-        return false;
-    }
-
     @Override
     protected int getHelpResource() {
         return R.string.help_uri_display;