I used the billet buttons, they are very nice pieces. You can order them without the pigtails, they'll send you the connectors loose so you don't end up splicing a bunch of wires.

Here's a tip if you're using these, wire the switch lights to be on all the time. I have pushbuttons for my headlights and high beams and it's nice to be able to easily see it when it's dark to turn the headlights on.