Yep, the window shape came right from the current model. Only difference (and I just noticed this!) is that the angle at the lower rear of the front side window is missing. The current X has that angle on front and rear windows. So in a way they're actually moving away from the Heep.

Here are my fixes for the rear badging. FOr some reason I think if it has to be there, the Nissan badge should be on the hump. However, mine would look like the second picture!