Refactor icon download

Refactor icon download.