Added icons
Refactored