BAC-1008: Visual Wordmarks are disappearing

Porting #2001 to the current release