new icon, little bit of refactoring