Merge change I77069a1e into eclair

* changes:
  Replace icon template with new style and multiple densities.