Self self self self self self (more cleanup)
More cleanup
Icons work somewhat decently now.