Now icons can be set as String with icons
Merge conflicts solved