Upgrading window switches. Early A2 to later A2 / A3 8P...

[VETRA]

Hello everybody!

I would like to update the old-school black window switches to the new chromed ones.
These (photo from the internet):

 

to these (my car photo ):

 

The driver's door is plug-n-play 🤘 😀
But for the passenger's doors it's not so easy on my car.
My A2 is an early-production one - it has different (old-school) connectors.
In the picture below you see the new window button (with the new connector) and the connector that my car has:

The new button has 4-pin connector, while the old one has 10-pin connector.
This picture shows both buttons side-by-side:

We can see that only pins 1, 2 and 5 are used in the old button.

Now - here are the diagrams:
Audi A2 Model-year 2000+

 

The new chromed buttons are for A3 8P...

Here are the diagrams for the A3:
Front passenger:

Rear passengers:

 

So, focusing on the A3 right rear passenger door (assuming before November 2005):

E54 (window switch) pins	connects to	J389 unit pins
1	-->	T32f / 23
2	-->	T32f / 4
3	-->	T32f / 8

 

My car:

E107 (window switch) pins	connects to	J387 unit pins
1	-->	T32d / 6
2	-->	T32d / 25
5	-->	T32d / 21

So my question is down to J387 and J389 units pinouts assignment, particularly how do the mentioned above pins correspond?

How can I connect wires from my old-type connector to the new-type button?

 

Thank you! 

[Aida]

Switch E107 = > E54

Pin 1 = > 1

Pin 2 = > 3

Pin 5 = > 2

 

@janihani posted here

Bearbeitet 9. April von Aida

[VETRA]

Oh my God!

Thank you so much for the unbelievably clear answer! You won't believe how long I was searching for this 

Thanks @Aida, thanks @janihani, thanks A2-freun.de!