Minor cleanup in StatusIconHandler