Swap positions of two shapes improvement

[phanex]

I love the Instrumenta dearly, and this tool is a lifesaver.

But it could be better. When you swap 2 objects, it would be great if you could swap not only the positions, but also the depth.

For example, I have pictures and some icons above them. When I swap the pictures, they go over the icons. I always have to use "bring to front" or "send to back". Can this be done automatically?

Here the picture 4 swapped with the picture below.