Icons update (WIP)