Just replaced my switch this evening. My advice is do this job with the front wheel removed. I did it with the wheel turned in and car jacked up. It was a pain in the arse but i've done it now and lights working fine now. 19mm ring spanner required and new switch to complete the job.
Gearbox Switch Part# 90482454