Merge change Ib720a080 into eclair

* changes:
  Updated icons for Settings. DO NOT MERGE