Revert "Building Icons, and level 1 UI hopefully fixed."

This reverts commit f1c6db3d6330de3551d4128bade9525f947f1293.
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit dbebdb4b3c0b91374d6c18fbce59afedd52b9216, reversing
changes made to 5de6e8317395a7ff6d4ecd8d9de0f7c809571cc4.