Fixes issues with the icons and the update_icon()