refactor and new icons