Replace indicator lights on K11

So I need to replace the front indicators on my K11 (because they're no longer orange) and though the manual doesn't explicitly state how to do this I assume it's the same as for the headlights. I.e. remove connector, remove rubber cap, remove spring e.t.c.
Problem is that the indicators are a lot tinier than the headlights and squeezed really far down and to the side of the engine bay behind a bunch of stuff and I can't imaging how I'm supposed to be able to pry them loose.
So do anyone have any tips for getting everything off and on again in a somewhat efficient manner? Is it possible to instead remove the headlight glass and remove the bulbs from the front? The front glass seems to be held on with a metal clip on the top but I'm not sure if it's just this I have to remove or if there's more stuff holding it.
 
Top