IDEX-604
Add json file icon
Merge branch 'master' into IDEX-1424