--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -177,23 +177,16 @@ pref("extensions.getAddons.search.url", 
 pref("extensions.blocklist.enabled", true);
 pref("extensions.blocklist.interval", 86400);
 pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/2/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
 pref("extensions.blocklist.detailsURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/blocklist/");
 
 /* 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);
 
 pref("keyword.enabled", true);
 pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
 
 pref("snav.enabled", false);

--- a/mobile/chrome/content/content.css
+++ b/mobile/chrome/content/content.css
@@ -15,31 +15,54 @@
  *
  * The Initial Developer of the Original Code is
  * Mozilla Corporation.
  * Portions created by the Initial Developer are Copyright (C) 2008
  * the Initial Developer. All Rights Reserved.
  *
  * 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
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** 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;
   display: none !important;
 }
 
 scrollbarbutton {
   -moz-appearance: none !important;