New button designs

Holding this open for review at the moment.
I also glossed over this code since it was for the options. Feel free to PR that if you want.