merge develop and change default box icon