more refactoring; more icons