I used forscan to enable the navigation yesterday, and after that the menus started working again (maybe during the restart it did).
I was then able to unlock with the png file and one more master reset brought the navigation up for me.
Thanks to all the people who worked this out, like JasonACT.
