Make icons searchable
Add a few more changes