rework icon presentation