am a21a458b: Merge change I3abd5c0d into eclair-mr2

Merge commit 'a21a458bf3ae8a7e6490221a5130b3d79818cb7b' into eclair-mr2-plus-aosp

* commit 'a21a458bf3ae8a7e6490221a5130b3d79818cb7b':
  Updated icons for Settings.