navigation highlight + update icons