Merge change I1c8ca2e4 into eclair

* changes:
  replace generic recovery icons