Fix <order> and icons