Some fixes and some new icons
Merge remote-tracking branch 'upstream/master'