improved icon functionality, fixed secondary indicator bug