diff --git a/content/homepage/contact.md b/content/homepage/contact.md
index 0646287..aee0301 100644
--- a/content/homepage/contact.md
+++ b/content/homepage/contact.md
@@ -6,12 +6,9 @@ weight: 4
 header_menu: true
 ---
 
-{{<icon class="fa fa-envelope">}}&nbsp;[mail@vanilla.engieering](mailto:mail@vanilla.engineering)
+{{<icon name="letter">}}{{< cloakemail "mail@vanilla.engineering" >}} ( {{<icon name="lock" height="18px">}}[gerne auch verschlüsselt](/keys) )
 
-{{<icon class="fa fa-phone">}}&nbsp;[+49 351 30973180](tel:+4935130973180)
+{{<icon name="call">}}{{< cloakemail address="+49 351 30973180" protocol="tel" >}}
 
+{{<icon name="user-id">}}Mein Profil auf {{<extlink href="https://www.linkedin.com/in/egruener" text="LinkedIn">}}
 
-{{<rawhtml>}}  
-<img src="/icons/linkedin.svg" height="22px" style="display:inline;"> Mein Profil auf <a href="https://www.linkedin.com/in/egruener" target="_blank">LinkedIn</a>
-
-{{</rawhtml>}}