Series II headlamps onto a 300 Tdi

I need to replace both headlamps on my 300Tdi as one is cracked and both have water sloshing around inside them.
I'm pretty sure pre-facelift series II headlamps will fit straight onto a 300Tdi (I've seen a series II with a series I lamp fitted on one side!?)
My question is does anyone know if the indicator assemblies and lamp finishers would fit too?

Hi, Indicator assembly would not fit as the wing around the indicator is a different shape. I have just purchased a TD5 and a week later sold my 300 TDi, whilst I had both, I spent some time comparing (admiring) both to see how on earth Land Rover could claim that every panel except the back door was different on the TD5- they are. The series 2 indicators are also the full height of the headlight, the 300TDi indicators are level with the top of the headlight but do not drop as low as the bottom. Hope this helps- I must appear to be very sad.

aye, yer wrong as well, there is a conversion kit, but yer dint really need it, some gady posted instructions and pics on here of ho to do it ages ago, do a search it should still be there

Thanks for the advice. I have purchased some TD5 headlamps and have decided to keep the original indicators/finishers. Also bought some EGR lamp protectors to preserve the new lamps.
BTW, Formula4 are doing Series I Disco (300) EGR covers for £19 + P&P reduced from about £35.