WIP: Icon improvements.