Fix #12025 and minify styles
Merge pull request #12025 from ZDroid/clean-visibility-mess

Fix #12015 and minify styles