Another vector icon, removed unused icons, removed now-unneeded template code