add icon
Merge remote-tracking branch 'origin/master'
change icons
fix wording
fix permissions