Upgrading window switches. Early A2 to later A2 / A4 / A6...

[VETRA]

Hello everybody!

I would like to update the old-school black window switches to the new chromed ones.
These:

to these:

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 (huge thanks to Tom @2work for the diagrams!!) :
Model-year 2000+

Model-year 2003+

From these diagrams I see that
1. the old button (E107) has three pins involved - 1/58, 2/VR and 5/31 - hooray, this matches the reality.
2. the new button (E107) has five pins involved (!) and these are 1/58, 2/VR, 3/VR, 5/31 and 2/31 - this is something I am not getting.

How can I connect wires from my old-type connector to the new-type button?
Pins 2/VR and 2/31 are not the same pins?

Can anyone help me by making a wiring table like this one, please?
(a wiring table for dummies...)

old-type connector pins	connect to	new-type button pins
1	-->	1 (?)
2	-->	2 & 3 (??)
5	-->	4 (??)

Thanks alot and a great day to everyone!

 

[VETRA]

Here is a bit of an update...
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 we are narrowing the question down to J387 and J389 units pinouts assignment, particularly how do the mentioned above pins correspond?