Changed path to icons folder
Added array checks
Added missing class