New icon and Email functionality