Merge change Ia1baa5ab into eclair

* changes:
  More icons