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