Merge change I80ce8833 into eclair

* changes:
  Icons again