update icons with the right logo
merge engine changes