Headlight bulb replacement Face Liftted

I have a 2012 facelift XF (2.2D Luxury). The nearside (passenger) inner headlight bulb (the one nearest to the grill that flashes orange/amber once when you central lock it) has gone. Left indicator a bit dodgy as a result, like the relay has gone. I know there is a cover behind the main dip beam of the unit to change that bulb, but there does not seem to be a cover for the orange/amber one next to it...? Has anyone managed to change this one successfully - if so, how? Or do I have to replace the whole unit because the clever person who designed this unit didn't factor in that the orange/amber inner bulb could fail? Any advice would be much appreciated. Thanks in advance, Andrew