Build fix.

Change import names to match current folder structure.
Fix broken icons.