diff --git a/lib/data/gecko-prefs.js b/lib/data/gecko-prefs.js
index 85d4ece0..cbbcfc11 100644
--- a/lib/data/gecko-prefs.js
+++ b/lib/data/gecko-prefs.js
@@ -19,94 +19,84 @@ user_pref("ui.-moz-fieldtext", "#000000");
 user_pref("ui.buttonface", "#D3D3DD");
 user_pref("ui.buttontext", "#000000");
 
-// Define our font size in points (to adapt to resolution)
+// Fonts
 user_pref("font.size.unit", "pt");
 
-user_pref("font.size.variable.ar", 12);
-user_pref("font.size.fixed.ar", 10);
+// Layout:
+// 1024x768 -> (96 * 6) / 1024 * 201 = 113 dpi
+// 800x600  -> (96 * 6) /  800 * 201 = 144 dpi
+//
+// Fonts:
+// 7  pt ->  7 / 12 * 201 = 117 dpi
+// 8  pt ->  8 / 12 * 201 = 134 dpi
+// 9  pt ->  9 / 12 * 201 = 150 dpi
 
-user_pref("font.size.variable.el", 12);
-user_pref("font.size.fixed.el", 10);
-
-user_pref("font.size.variable.he", 12);
-user_pref("font.size.fixed.he", 10);
-
-user_pref("font.size.variable.ja", 12);
-user_pref("font.size.fixed.ja", 12);
-
-user_pref("font.size.variable.ko", 12);
-user_pref("font.size.fixed.ko", 12);
-
-user_pref("font.size.variable.th", 12);
-user_pref("font.size.fixed.th", 10);
-
-user_pref("font.size.variable.tr", 12);
-user_pref("font.size.fixed.tr", 10);
-
-user_pref("font.size.variable.x-baltic", 12);
-user_pref("font.size.fixed.x-baltic", 10);
-
-user_pref("font.size.variable.x-central-euro", 9);
-user_pref("font.size.fixed.x-central-euro", 10);
-
-user_pref("font.size.variable.x-cyrillic", 12);
-user_pref("font.size.fixed.x-cyrillic", 10);
-
-user_pref("font.size.variable.x-devanagari", 12);
-user_pref("font.size.fixed.x-devanagari", 10);
-
-user_pref("font.size.variable.x-tamil", 12);
-user_pref("font.size.fixed.x-tamil", 10);
-
-user_pref("font.size.variable.x-armn", 12);
-user_pref("font.size.fixed.x-armn", 10);
-
-user_pref("font.size.variable.x-beng", 12);
-user_pref("font.size.fixed.x-beng", 10);
-
-user_pref("font.size.variable.x-cans", 12);
-user_pref("font.size.fixed.x-cans", 10);
-
-user_pref("font.size.variable.x-ethi", 12);
-user_pref("font.size.fixed.x-ethi", 10);
-
-user_pref("font.size.variable.x-geor", 12);
-user_pref("font.size.fixed.x-geor", 10);
-
-user_pref("font.size.variable.x-gujr", 12);
-user_pref("font.size.fixed.x-gujr", 10);
-
-user_pref("font.size.variable.x-guru", 12);
-user_pref("font.size.fixed.x-guru", 10);
-
-user_pref("font.size.variable.x-khmr", 12);
-user_pref("font.size.fixed.x-khmr", 10);
-
-user_pref("font.size.variable.x-mlym", 12);
-user_pref("font.size.fixed.x-mlym", 10);
-
-user_pref("font.size.variable.x-unicode", 9);
-user_pref("font.size.fixed.x-unicode", 10);
-
-user_pref("font.size.variable.x-western", 9);
-user_pref("font.size.fixed.x-western", 10);
-
-user_pref("font.size.variable.zh-CN", 12);
-user_pref("font.size.fixed.zh-CN", 12);
-
-user_pref("font.size.variable.zh-TW", 12);
-user_pref("font.size.fixed.zh-TW", 12);
-
-user_pref("font.size.variable.zh-HK", 12);
-user_pref("font.size.fixed.zh-HK", 12);
-
-// Font families for Arabic
+user_pref("layout.css.dpi", 134);
 
 user_pref("font.name.cursive.ar", "KacstQurn");
 user_pref("font.name.fantasy.ar", "KacstDecorative");
 user_pref("font.name.monospace.ar", "KacstDigital");
 user_pref("font.name.sans-serif.ar", "KacstQurn");
 user_pref("font.name.serif.ar", "KacstBook");
+user_pref("font.default.ar", "sans-serif");
+user_pref("font.size.variable.ar", 12);
+user_pref("font.size.fixed.ar", 9);
+
+user_pref("font.default.el", "serif");
+user_pref("font.size.variable.el", 12);
+user_pref("font.size.fixed.el", 9);
+
+user_pref("font.default.he", "sans-serif");
+user_pref("font.size.variable.he", 12);
+user_pref("font.size.fixed.he", 9);
+
+user_pref("font.default.ja", "sans-serif");
+user_pref("font.size.variable.ja", 12);
+user_pref("font.size.fixed.ja", 12);
+
+user_pref("font.default.ko", "sans-serif");
+user_pref("font.size.variable.ko", 12);
+user_pref("font.size.fixed.ko", 12);
+
+user_pref("font.default.th", "serif");
+user_pref("font.size.variable.th", 12);
+user_pref("font.size.fixed.th", 9);
+
+user_pref("font.default.tr", "serif");
+user_pref("font.size.variable.tr", 12);
+user_pref("font.size.fixed.tr", 9);
+
+user_pref("font.default.x-baltic", "serif");
+user_pref("font.size.variable.x-baltic", 12);
+user_pref("font.size.fixed.x-baltic", 9);
+
+user_pref("font.default.x-central-euro", "serif");
+user_pref("font.size.variable.x-central-euro", 12);
+user_pref("font.size.fixed.x-central-euro", 9);
+
+user_pref("font.default.x-cyrillic", "serif");
+user_pref("font.size.variable.x-cyrillic", 12);
+user_pref("font.size.fixed.x-cyrillic", 9);
+
+user_pref("font.default.x-unicode", "serif");
+user_pref("font.size.variable.x-unicode", 12);
+user_pref("font.size.fixed.x-unicode", 9);
+
+user_pref("font.default.x-western", "serif");
+user_pref("font.size.variable.x-western", 12);
+user_pref("font.size.fixed.x-western", 9);
+
+user_pref("font.default.zh-CN", "sans-serif");
+user_pref("font.size.variable.zh-CN", 12);
+user_pref("font.size.fixed.zh-CN", 12);
+
+user_pref("font.default.zh-TW", "sans-serif");
+user_pref("font.size.variable.zh-TW", 12);
+user_pref("font.size.fixed.zh-TW", 12);
+
+user_pref("font.default.zh-HK", "sans-serif");
+user_pref("font.size.variable.zh-HK", 12);
+user_pref("font.size.fixed.zh-HK", 12);
 
 // Enable error pages (xulrunner is missing this pref)
 user_pref("browser.xul.error_pages.enabled", true);
diff --git a/tools/build-snapshot.sh b/tools/build-snapshot.sh
index 1861ebab..0407c732 100755
--- a/tools/build-snapshot.sh
+++ b/tools/build-snapshot.sh
@@ -1,6 +1,6 @@
 VERSION=0.63
 DATE=`date +%Y%m%d`
-RELEASE=2.56
+RELEASE=2.57
 TARBALL=sugar-$VERSION-$RELEASE.${DATE}git.tar.bz2
 
 rm sugar-$VERSION.tar.bz2