added icons, modified notifications