improved icon functionality
Merge pull request #250 from jpecht/master

improved icon functionality, fixed secondary indicator bug