2021.11: Icon picker, device links and entity categories

Is anyone else having Homekit integration issues? I tried adding a new device to one of my bridges via the UI and noticed each domain under the domain selector is repeated twice. (see photo). I hit submit and select the new entity (zha switch) in “include” mode. If I hit submit again, I get a “User Import malformed error” and cannot proceed to the next step. Neither integration reloads nor core restarts solve the issue. Any ideas? Looks like others are having the same issue: https://community.home-assistant.io/t/homekit-error-user-input-malformed/353390
Screen Shot 2021-11-06 at 6.24.49 PMScreen Shot 2021-11-06 at 6.24.34 PM