Unfinished build

Currently includes icon registry bugs