New button designs

Holding this open for review at the moment.