Add missing icons and fix refactoring issue