IDEX-604 use method in iconregistry that doesn't return default icon
Merge remote-tracking branch 'origin/master'