Fix: avoid error if extrafield ico not defined
Fix: minor changes