New button designs

Holding this open for review at the moment.
More duplicate code.  Man, there's tons of code here that does hardly anything.
Not your code, but future cleanup to-do's.  =D