[DO NOT REVIEW] Fixes #6175 - Handle new status icon that was added