Issues/172 consistent button styles

NB @dracos #185 is a prereq for this as this branches from there (as discussed)

Closes #172