file icons
Merge branch 'master' into beta
missing string
Merge branch 'master' into beta