be allowed on a right clic to chose visually the shape to be applied to each photo. May be even better with if non rectangular shapes are offered too (hearts, circles, etc.)

It would slow a bit the process, but may allow far more flexibility...