Start to handle more icons