Make header icon placement more consistent