Fixes some bugs where an icon is revmoed that does not have a parent. Not sure why this occcurs. Fixing for now to get past on to new development.