Convert old button override styles to new classes

(and some cleanup)