Merge change I96aad5c6 into eclair

* changes:
  Updated status bar icons.