Notifications: icon fix & Code cleanup