Fix #11302 and minify styles