Fixed the issues with icons