diff --git a/app/assets/images/fonts/svg-icons/mail_white.svg b/app/assets/images/fonts/svg-icons/mail_white.svg
deleted file mode 100644
index 5d21bd83a..000000000
--- a/app/assets/images/fonts/svg-icons/mail_white.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="70px"
-   height="40px">
-  <path
-     style="fill:#fefefe"
-     d="M 0,20.50854 C 0,4.9747198 0.0555205,1.0473598 0.2734375,1.1662098 c 0.15039063,0.082 3.756821,2.50162 8.0142897,5.3768802 4.2574688,2.87526 7.7723718,5.18087 7.8108958,5.12358 0.03852,-0.0573 0.197328,0.049 0.352898,0.23633 0.304769,0.36687 4.329729,3.16109 4.329729,3.00579 0,-0.0515 0.312191,0.17793 0.693756,0.50984 0.381567,0.33191 0.775316,0.55547 0.875001,0.49679 0.09968,-0.0587 0.181243,-0.0199 0.181243,0.0863 0,0.17515 1.4204,1.17408 1.798547,1.26487 0.08686,0.0208 0.475045,0.31377 0.862638,0.65092 0.387595,0.33716 0.740563,0.57887 0.784377,0.53714 0.04381,-0.0417 0.388343,0.19265 0.765625,0.52084 0.37728,0.32818 0.721811,0.56256 0.765625,0.52083 0.04381,-0.0417 0.386174,0.19076 0.760803,0.51664 0.374632,0.32588 0.762708,0.5445 0.862392,0.48583 0.09968,-0.0587 0.181243,-0.0233 0.181243,0.0786 0,0.23477 1.966416,1.59121 1.975402,1.36264 0.0037,-0.0931 0.106984,-0.005 0.22962,0.19539 0.122631,0.20052 0.311441,0.36458 0.419578,0.36458 0.108138,0 0.462148,0.23437 0.786697,0.52083 0.324548,0.28646 0.712838,0.52084 0.862866,0.52084 0.150029,0 0.334847,0.15404 0.410707,0.34232 0.07587,0.18827 0.199705,0.28348 0.275212,0.21157 0.07551,-0.0719 0.255963,0.0238 0.401017,0.21275 0.236803,0.30843 0.400949,0.25183 1.607568,-0.55426 0.739108,-0.49376 1.343833,-0.97792 1.343833,-1.0759 0,-0.098 0.07758,-0.15471 0.17241,-0.12607 0.18371,0.0555 18.700235,-12.40475 19.349573,-13.02083 0.211348,-0.20052 0.384267,-0.32198 0.384267,-0.26991 0,0.0521 2.534765,-1.618 5.632812,-3.7112702 3.098048,-2.09326 5.903516,-3.97477 6.234375,-4.18113 L 70,0.9937498 70,20.49687 70,40 35,40 0,40 0,20.50854 Z M 24.49916,15.76283 C 18.904168,11.96306 11.380861,6.86198 7.7806989,4.4270798 L 1.234951,-2e-7 l 33.759559,0 33.759558,0 -3.478598,2.36022 C 43.901195,16.86261 35.18624,22.70533 34.951873,22.68991 34.797875,22.67978 30.094154,19.56259 24.49916,15.76283 Z"
-     id="path3371"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/app/assets/stylesheets/typography.scss b/app/assets/stylesheets/typography.scss
index f94253f80..0aa346ae1 100644
--- a/app/assets/stylesheets/typography.scss
+++ b/app/assets/stylesheets/typography.scss
@@ -21,7 +21,3 @@
 .diaspora-custom-compose:before {
   content: 'a';
 }
-
-.diaspora-custom-mail:before {
-  content: 'b';
-}
diff --git a/app/views/layouts/_header.mobile.haml b/app/views/layouts/_header.mobile.haml
index 288406870..799c2fc79 100644
--- a/app/views/layouts/_header.mobile.haml
+++ b/app/views/layouts/_header.mobile.haml
@@ -16,7 +16,7 @@
         -# Conversations
         %li
           = link_to conversations_path, class: "badge-link", id: "conversations-badge" do
-            %i.diaspora-custom-mail
+            %i.entypo-mail
             - if current_user.unread_message_count > 0
               %span.badge.badge-important#conversation
                 = current_user.unread_message_count