Further improvements in error handling
Updating icon
Updating tooltip along with badge + moving shared data/code