Potential fix for icons #12