They definately fit mark 1 as I have trialled them on a front panel.
I have repro mark 2 style buckets in stock for round lights @ $31.50 each:

But they do not have the rings, etc
I will also have repro mark 2 round light grilles with the FORD oval badge in stock in January