Fixed js
Add icons
Merge branch 'acro/dev2' into dev