Nav icons bugfixes