Fixed string value check

Icons now working as intended, problem was with immutable Strings
Pre-fragments

Switching in fragments for later use