Icon Refactor

by Guillermo Mont