Even more icons optimization