Remove leftover icons
Add Generator exit menu handler