Master Components and Instances containing SVGs

Hi

I would if anyone can help me, as i am currently pulling my hair out. I've built a grid of client logos that function as buttons. Each has a rollover state and each contains a client logo which is an SVG.

In order for each box to have a set amount of white space i have used two boxes. The first is the background transparent box that functions as the shape. The second is a smaller box which will contain the SVG logo. The smaller box functions as a mask. I've then made this into a Master component. I then add instances of this component onto the page to build the grid of logos.

The issue comes when i then try to replace the SVG logo. If i drag a new logo into the mask, it doesn't replace the one which is already there. If i drag the new svg onto the existing svg it becomes masked by the original logo.

This is drving me nuts, and is stopping me from creating the logo grid from a single Master component.

Can anyone throw any light onto what i am doing wrong? I am in the process of transitioning from photoshop to XD for web design, but this is driving me nuts.

Thanks.