Start rework of Icon object