Upgraded to latest API changes, and added direction icons to WPF