Reorganize build tweaks icons and properly rename