Resolve #35 Hardened handling around non-object icons