Finally got every thing working and custom icon made
Merge remote-tracking branch 'origin/Working'