Thank You for choosing Just Answer for your query. Yes, I can help you.
This 2004 model should be a B6 = 02 to 05.5, B7 = 05.5 to 07, B8 = 08+, B5 96 to 01.
To remove the headlight you will need to replace the two top screws and loosen (do not remove) the two lower, back screws as indicated
I hope that I have answered your questions and addressed your concerns. Should you have any further questions for me, please do not hesitate to ask. I want you to be 100% satisfied with my answer.
Positive feedback and bonuses are always appreciated! If you accept my answer please click on the "ACCEPT" button by THIS answer.
Jake "THE AUDI DOCTOR"