Based on the pictures too, it looks like what Bob sells are those newer leaf style buttons that are press-fitted, not with an e-clip.
Does anyone still sell the older style with an e-clip?
I've got a Rally-X cabaret I just finished restoring/cleaning up. I ended up just polishing my buttons, but if there was a good replacement...I'd consider it as well.