Follow-up from "feat: migrate GlBadge"

The following discussion from !4713 (merged) should be addressed: