Instant swap property distorts nested component aspect ratio when the two instances aren't the same size

Auto layout should solve your problem. I don’t know what the structure of your icon components is, but you might need to add an additional wrapper.

https://forum.figma.com/t/issue-keep-the-scaling-of-a-nested-component-when-swapping-it/1009/23