modify icon, remove icon, code refactoring