Code optimize, Build phase with Bundle Icon and few cleanup