Change labels and add icons
Exclude dist folder
Merge branch 'dev'