diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 8176e2317488..53df36403a2a 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -66,6 +66,11 @@
 <!ENTITY pref_enable_flash_yes "Yes">
 <!ENTITY pref_enable_flash_tap_to_play "Tap To Play">
 <!ENTITY pref_enable_flash_no "No">
+<!ENTITY pref_font_size "Font size">
+<!ENTITY pref_font_size_small "Small">
+<!ENTITY pref_font_size_medium "Medium">
+<!ENTITY pref_font_size_large "Large">
+<!ENTITY pref_font_size_xlarge "Extra Large">
 
 <!ENTITY quit "Quit">
 
diff --git a/mobile/android/base/resources/values/arrays.xml b/mobile/android/base/resources/values/arrays.xml
index 302bdf8f269a..c993d0ea984b 100644
--- a/mobile/android/base/resources/values/arrays.xml
+++ b/mobile/android/base/resources/values/arrays.xml
@@ -11,4 +11,16 @@
         <item>2</item>
         <item>0</item>
     </string-array>
+    <string-array name="pref_font_size_entries">
+        <item>@string/pref_font_size_small</item>
+        <item>@string/pref_font_size_medium</item>
+        <item>@string/pref_font_size_large</item>
+        <item>@string/pref_font_size_xlarge</item>
+    </string-array>
+    <string-array name="pref_font_size_values">
+        <item>120</item>
+        <item>160</item>
+        <item>200</item>
+        <item>280</item>
+    </string-array>
 </resources>
diff --git a/mobile/android/base/resources/xml/preferences.xml b/mobile/android/base/resources/xml/preferences.xml
index e999a55380a6..34bbedaed0bb 100644
--- a/mobile/android/base/resources/xml/preferences.xml
+++ b/mobile/android/base/resources/xml/preferences.xml
@@ -25,6 +25,12 @@
                             android:entryValues="@array/pref_enable_flash_values"
                             android:persistent="false" />
 
+        <ListPreference     android:key="font.size.inflation.minTwips"
+                            android:title="@string/pref_font_size"
+                            android:entries="@array/pref_font_size_entries"
+                            android:entryValues="@array/pref_font_size_values"
+                            android:persistent="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_category_privacy">
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index c3cf03cc0e93..e9024b2c5c3f 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -72,6 +72,11 @@
   <string name="pref_enable_flash_yes">&pref_enable_flash_yes;</string>
   <string name="pref_enable_flash_tap_to_play">&pref_enable_flash_tap_to_play;</string>
   <string name="pref_enable_flash_no">&pref_enable_flash_no;</string>
+  <string name="pref_font_size">&pref_font_size;</string>
+  <string name="pref_font_size_small">&pref_font_size_small;</string>
+  <string name="pref_font_size_medium">&pref_font_size_medium;</string>
+  <string name="pref_font_size_large">&pref_font_size_large;</string>
+  <string name="pref_font_size_xlarge">&pref_font_size_xlarge;</string>
 
   <string name="reload">&reload;</string>
   <string name="forward">&forward;</string>
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 309d82cebb0c..5906e01e7d45 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -480,14 +480,14 @@ var BrowserApp = {
             pref.type = "bool";
             pref.value = pref.value == 0;
             break;
-          case "permissions.default.image":
-            pref.type = "bool";
-            pref.value = pref.value == 1;
-            break;
           case "browser.menu.showCharacterEncoding":
             pref.type = "bool";
             pref.value = pref.value == "true";
             break;
+          case "font.size.inflation.minTwips":
+            pref.type = "string";
+            pref.value = pref.value.toString();
+            break;
         }
 
         prefs.push(pref);
@@ -520,14 +520,14 @@ var BrowserApp = {
         json.type = "int";
         json.value = (json.value ? 0 : 2);
         break;
-      case "permissions.default.image":
-        json.type = "int";
-        json.value = (json.value ? 1 : 2);
-        break;
       case "browser.menu.showCharacterEncoding":
         json.type = "string";
         json.value = (json.value ? "true" : "false");
         break;
+      case "font.size.inflation.minTwips":
+        json.type = "int";
+        json.value = parseInt(json.value);
+        break;
     }
 
     if (json.type == "bool")