Trouble shoot custom button card yaml

I've a button grid setup on a dashboard and it was all working well until I was hit with the recent tapo t125M plug authentication bug.
I've gotten the plugs working again but my button grid started displaying in a way that I do not like.... the icons for the some of the buttons which had to be fixed changed from the switch icon to a plug icon. I also found that one of my wiz bulbs changed to a light bulb icon. The only way around it that I found was to add explicit state: "on" and state: "off" lines with the desired icon to the sections in the YAML. I'm guessing that I have some bug in my yaml and I'm hoping that somebody can point it out.

desired:

without the explicit state lines:

YAML for the grid (no explicit state callout for HW desk, explicit callout for living_room_table_lamp

type: grid
cards:
  - type: custom:button-card
    entity: switch.living_room_hwdeskoutlet
    name: HW Desk
    section_mode: false
    styles:
      card:
        - height: 60px
      name:
        - font-size: 9px
  - type: custom:button-card
    entity: switch.garage_flood_lights
    section_mode: false
    styles:
      card:
        - height: 60px
      name:
        - font-size: 9px
  - type: custom:button-card
    entity: light.living_room_table_lamp
    state:
      - value: "on"
        icon: mdi:toggle-switch-variant
      - value: "off"
        icon: mdi:toggle-switch-variant-off
    section_mode: false
    styles:
      card:
        - height: 60px
      name:
        - font-size: 9px
  - type: custom:button-card
    entity: light.sunporch_cliplight
    state:
      - value: "on"
        icon: mdi:toggle-switch-variant
      - value: "off"
        icon: mdi:toggle-switch-variant-off
    section_mode: false
    styles:
      card:
        - height: 60px
      name:
        - font-size: 9px
  - type: custom:button-card
    entity: switch.unnamed_p125m
    section_mode: false
    name: red string
    styles:
      card:
        - height: 60px
      name:
        - font-size: 9px
  - type: custom:button-card
    entity: switch.unnamed_p210m_tapo_smart_plug_1
    section_mode: false
    name: floor lamp
    styles:
      card:
        - height: 60px
      name:
        - font-size: 9px
  - type: custom:button-card
    entity: switch.unnamed_p210m_tapo_smart_plug_2
    section_mode: false
    name: white string
    styles:
      card:
        - height: 60px
      name:
        - font-size: 9px
  - type: custom:button-card
    entity: switch.tapo_meditation_lights_2
    section_mode: false
    name: meditation room string
    styles:
      card:
        - height: 60px
      name:
        - font-size: 9px

And why don’t you use the same “ state -value on/off “ for the HW Desk ?