Merge change I3abd5c0d into eclair-mr2

* changes:
  Updated icons for Settings.