Potential fix for icons #13