Sounds Complex. I think introducing icons by theme as a sort option and adding to the library would be a good starting point or even solution.
I nominate these icons or similar be added: https://material.io/resources/icons/?style=baseline
They are a style missing from the library. These are modern and clean design.