Still hunting for sugar and cream...

To see what I'm working with, I will show you photos of my teacups. Ideally, I would like to find a cream/sugar set that will work with either style of cup/saucer.

Option 1:
A simple, rounded design of crisp white ceramic with a thin orange line that runs the circumference of both saucer and cup.
Option 2:
A curvy style, retro in nature, which boasts a teacup of teal and white against a saucer with a playful whisp of leaves in the same teal and aqua.
Now after seeing my cups, can you maketh them run over with sugar and cream? Help me find a sugar & cream set to match!