Instance swap does not always swap the correct property

Hi everyone, bringing this to the community because I’m curious if anyone else has experienced this and could offer some suggestions.

I’m using the instance swap of an icon inside a button - the icon itself has size variants built in. I created the button with 24px icons, however, when the icon gets swapped for another icon in the library it populates at 32px (which is our default size). In order to fix this, I have to dig into the layers, grab the icon component and change the size variant back down to 24.

It would be so much more efficient if the instance swap was smart enough to maintain the properties of the original icon component.

Any info or ideas on this would be appreciated - thanks!