Added missing mail icons
Removed pointless mailfunc