Adjust CSS menu classes
Merge remote-tracking branch 'origin/develop' into 2.4compatibility