1. added error icon
2. Added retry scheduling for error and success cases
Merge remote-tracking branch 'origin/master'