#4: restore spacer between buttons
Merge remote-tracking branch 'origin/gaps' into gaps-next