IDEX-604 use icons from icon registry
Merge remote-tracking branch 'origin/master'