Merge "Simplifying IconShape" into main