Fix navigation icons conflict