LPS-44100 Apply to remaining display styles