Fixed the generator bug
Merge cutem icon implementation from branch 'eonasdan'