otimization (hopefully) + icon and name change