Fix #12025 and minify styles