Potential fix for icons #11