refactoring of icon design