Icon fixes
Prep for hub appearance
Numerous Bugfixes, imported from BS12