removed icons classes and moved to factory methods