Bugfix, remove segfault when null value is set for icon and _icon==null
Merge branch 'set_icon_bug' into development