Refactored and added an icon