My first CDN2 washer and button look like this:
The new CDN2 washer squirter looks like this (shown to the left of the hood hinge in the black area), has a foot mounted rubber pump on the extreme left drivers side foot area and has a white coloured round plastic bottle near the solid state turn signal box:
The new CDN2 windshield markings: