Forward-port tweaks to content buttons from 1.x.