Fix Bug 869474, make header a11y happy

@brandonsavage @AdrianGaudebert r?