Refactor
Add new icon