SONAR-5209 Redesign headers