Tweak paddings and margins. #1684