icons/subicons added
merge