Rename class to be more descriptive & add icons
Add missing build update