Admin toolbar header issues

Konstantin Shupenkorequested to merge
issue/navigation-3438850:3438850-admin-toolbar-header into 1.x

Closes #3438850

Merge request reports