[#74658262] Modal buttons use new styles & states
[Finishes #74658262] reorder cancel, secondary & primary dialog buttons
[#74658262] DRY up button colors