Icon size refactoring