Extra improvements to new icons

Small iteration