Fix bug on adminimal theme

Closes #3453179

approved this merge request

added 2 commits

• 67f3eb74 - 1 commit from branch project:1.0.x
• 0d6bbea5 - Fix bug on adminimal theme

Compare with previous version

merged