Fix for Indicator icon label issue