Merge branch 'hotfix/hotfix'
Index with icons
Merge branch 'hotfix/hotfix' into develop