Fixed icon bugs

Fixed icon bugs and added a functionality to add a blank in a combination matching a different icon if one matching a first icon or icons is an identical combination.