Removed debug code, added default icon