Properly reset options
Added icons for new categories