Tweaks for shield tokens, made slightly smaller and more robust