Added icon image and bugfixes