Fixed regressions with icons