diff --git a/mobile/app/mobile.js b/mobile/app/mobile.js
index fb8d015d78b..cdc961b0153 100644
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -182,13 +182,6 @@ pref("extensions.blocklist.detailsURL", "http://%LOCALE%.www.mozilla.com/%LOCALE
 /* dictionary download preference */
 pref("browser.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/%VERSION%/dictionaries/");
 
-/* make clicking on links stand out a bit */
-pref("browser.display.use_focus_colors", true);
-pref("browser.display.focus_background_color", "#ffffa0");
-pref("browser.display.focus_text_color", "#00000");
-pref("browser.display.focus_ring_on_anything", true);
-pref("browser.display.focus_ring_style", 0);
-
 /* block popups by default, and notify the user about blocked popups */
 pref("dom.disable_open_during_load", true);
 pref("privacy.popups.showBrowserMessage", true);
diff --git a/mobile/chrome/content/content.css b/mobile/chrome/content/content.css
index 049616afa42..b31d2627eee 100644
--- a/mobile/chrome/content/content.css
+++ b/mobile/chrome/content/content.css
@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *   Mark Finkle <mfinkle@mozilla.com>
+ *   Doug Turner <dougt@mozilla.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -35,6 +36,28 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/* make clicking on links stand out a bit (bug 532206) */
+html *:not(embed):focus, *:focus > font {
+  color: #000000 !important;
+  background-color: #ffffa0 !important;
+}
+
+html *|*:link:focus, *|*:visited:focus {
+  outline: 1px solid;
+  -moz-mac-focusring !important;
+  -moz-outline-radius: 3px;
+  outline-offset: 1px;
+}
+
+html button::-moz-focus-inner, input[type="reset"]::-moz-focus-inner, input[type="button"]::-moz-focus-inner, input[type="submit"]::-moz-focus-inner {
+  padding: 1px 2px 1px 2px;
+  border: 1px solid transparent !important;
+} 
+
+html button:focus::-moz-focus-inner, input[type="reset"]:focus::-moz-focus-inner, input[type="button"]:focus::-moz-focus-inner, input[type="submit"]:focus::-moz-focus-inner {
+  border-color: ButtonText !important;
+}
+
 /* Style the scrollbars */
 scrollbar {
   -moz-appearance: none !important;