Some icons refactoring