Added in more missing icons and fixed things up