Added shape target icons and shape names.