Updated construct with icon targets and new icons