A few changes in the code related to update icon and notifications