Fixed all the stuff related to icons