Add icon, fix sorting