Updating entities
Fixes errors
Add icon