More nav icon bugfixes