refactor: extract to method
add icon to option
Merge 85d3387c98501d9f5d65a72b0600fb5662df48d9 into c65a2b5188e080fa9b0d7e420e239319a9fba915