Edited icons
Added support for new icons