- Fixed data icon layering
- Data icons now picked up properly