Fixed false notification and use new icons