Add Icons and Refactoring