Fixed bugs. Change logic for set current icon