diff --git a/_src/_assets/styles/bigchain/_icons.scss b/_src/_assets/styles/bigchain/_icons.scss
index ea085c2..4929b70 100644
--- a/_src/_assets/styles/bigchain/_icons.scss
+++ b/_src/_assets/styles/bigchain/_icons.scss
@@ -15,15 +15,11 @@
     width: 1rem;
     height: 1rem;
     stroke: none;
-    fill: $link-color;
+    fill: $text-color;
+    margin-bottom: -2px;
 }
 
-a {
-    &:hover,
-    &:focus {
-        .icon--twitter  { fill: #55acee }
-        .icon--facebook { fill: #3b5998 }
-        .icon--linkedin { fill: #0077b5 }
-        .icon--github   { fill: #4183c4 }
-    }
+.icon--sm {
+    width: .5rem;
+    height: .5rem;
 }
diff --git a/_src/_assets/styles/page-contact.scss b/_src/_assets/styles/page-contact.scss
index b5bf9c0..1d64d5a 100644
--- a/_src/_assets/styles/page-contact.scss
+++ b/_src/_assets/styles/page-contact.scss
@@ -6,4 +6,7 @@
 
 .contactlist {
     p { margin-bottom: 0 }
+
+    .p-adr  { margin-bottom: $spacer; }
+    .social { margin-top: $spacer; }
 }
diff --git a/_src/contact.html b/_src/contact.html
index fa19f7f..6e5a4ae 100644
--- a/_src/contact.html
+++ b/_src/contact.html
@@ -5,21 +5,34 @@ title: Contact
 ---
 
 <section class="section section-contactform">
-    <div class="row">
+    <div class="row row--wide">
         <header class="section-header">
             <h1 class="section-title">Get in touch</h1>
         </header>
 
-        <div class="grid grid--full grid-small--columns grid--gutters">
+        <div class="grid grid--full grid-medium--columns grid--gutters">
             <div class="grid__col grid__col--4">
                 {% include/form-contact.html %}
             </div>
             <div class="grid__col grid__col--2">
-                <div class="contactlist">
-                    <p>{{ site.address.street }}</p>
-                    <p>{{ site.address.zip }} {{ site.address.city }}</p>
-                    <p>{{ site.address.country }}</p>
-                    <p>{{ site.email.contact }}</p>
+                <div class="h-card contactlist">
+                    <p><strong class="p-name p-org">{{ site.name }}</strong></p>
+
+                    <div class="p-adr">
+                        <p class="p-street-address">{{ site.address.street }}</p>
+                        <p><span class="p-postal-code">{{ site.address.zip }}</span> <span class="p-locality">{{ site.address.city }}</span></p>
+                        <p class="p-country-name">{{ site.address.country }}</p>
+                    </div>
+
+                    <p><a class="u-url" href="{{ site.url }}">{{ site.url | remove: 'https://' }}</a></p>
+                    <p><a class="u-email" href="mailto:{{ site.email.contact }}">{{ site.email.contact }}</a></p>
+
+                    <p class="social">
+                        <a href="https://twitter.com/{{ site.twitter }}">
+                            <svg class="icon icon--social icon--twitter"><use xlink:href="/assets/img/sprite.svg#twitter"></use></svg>
+                            Twitter
+                        </a>
+                    </p>
                 </div>
             </div>
         </div>