Adds icons. Fixes performance issues.