Some fixes and some new icons