Further refactoring of icons