- Added Icon Handling