bug fixes + new icons