Re-iconify
More nav tweaks