Correct, the buttons are identically located. Mk1 button caps, plus a hole in a mk1 fascia, will fit on a mk2 - though the handle will look a bit strange!

Hugo