did icons and refactoring
fixes