Fixed missing check for highlighted font color on GUI icon button
Removed redundant check
Merge pull request #584 from klaussilveira/master

Copy of PR #551 changed to target development.