Reorder elements, rename an option naming

ressarequested to merge
issue/admin_toolbar-3520680:3520680-adjust-admin-toolbar into 3.x

Closes #3520680

Merge request reports