Update badges and chevrons to play nice.

Fixes #365