In fact icon is more or less correct (cat. 3 subcat. 3), but these switches are reported as lights in shortcuts section (turn all on/off).
I don't mind that they became switches (in fact they should be), but then they also should disappear from "lithts" shortcut.
The funny thing is that outdoor switch (subcat. 2) still presents itself as bulb, while it is not reported as "light" by the shortcut.