Fixed wrong icon path
Refactored some code to create better information output