new icons, minor refactoring