fixing mail icon
fixes
fixed conflicts