If that is easier, yeah, that does seem like it could work. If all of the other styles are going to become theme components, it might make most sense for Category Icons to become basically just another one of those.
I am sorry for sounding grumpy about this one! It’s kind of worked its way into being a pet peeve.