Backport some tweaks from redundant checkbox styles branch