add icon and fix mail