Bugfix for TabBar icon refresh
Merge