Update missing icon handling
Moved back build scripts