References #1397 - Removed dead code.
References #1397 - Modified icon showing code. Multiple icons are indicated by a star.