Potential fix for icons #8