All hail the mighty quattro!
The seperate indicator is easy to remove. looking from above where the 2 units meet there is what looks like a plastic cross head screw, fairly over size, use a long screwdriver and push down on this, it should pop down on on a sprung bit of plastic, with this pushed down just pull the indicator out towards the front of the car and hey presto out it slides on 2 guide rails on the headlight. You should then beable to get to the final torx screw on the side of the headlight, I used a screwdriver torx bit with the right sive ring spanner sipped over it.
The washer pump is inside the wing, you need to jack up, take wheel off,remove the arch liner and you should see it all there, the pump just pulls out of the bottle, the hoses are just clipped onto it, remove and swap.