Fixes #3156 some icons are broken