Use new, better icon scheme