Refactor main nav icons