Refactor icons and minor fixes