Fixed the "icon sometimes not visible" bug