revert changes to Icon class (1f88393)
Merge remote-tracking branch 'origin/master'