additional fixes and new icons