Merge change Ifaf19b53 into eclair

* changes:
  More icons