Separate navigation from icon population