Merge branch '33942-cross-reference-icon-no-longer-visible-in-normal-sidebar' into 'master'

Resolve "Cross-reference icon no longer visible in normal sidebar"

Closes #33942

See merge request !12299