Replace a couple stragglers, delete unused icons