Fix icon processing + fix URLs

See commits...