Ux 2013 01 11 cherry picked

* [Bug 802314](https://bugzilla.mozilla.org/show_bug.cgi?id=802314) - Keyboard is not to design spec.
* [Bug 808250](https://bugzilla.mozilla.org/show_bug.cgi?id=808250) - In Display settings, the icons for brightness slider seem flipped to people