new icons
small refactor