diff --git a/_includes/contact.html b/_includes/contact.html
index b8a85c2e..be330fba 100644
--- a/_includes/contact.html
+++ b/_includes/contact.html
@@ -25,12 +25,12 @@
             <i class="fa fa-comment"></i>
             Chat
           </a>
-          <a href="https://github.com/openSUSE/osem" class="btn btn-link">
-            <i class="fa fa-github-alt"></i>
-            Code
+          <a href="https://twitter.com/osempossum" class="btn btn-link">
+            <i class="fa fa-twitter"></i>
+            Twitter
           </a>
         </div>
       </div>
     </div>
   </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/_includes/navigation.html b/_includes/navigation.html
index 33e00583..8f06c059 100644
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -29,10 +29,14 @@
                     <a class="page-scroll" href="/#team">Team</a>
                 </li>
                 <li>
-                    <a class="page-scroll" href="/#contact">Join Us</a>
+                    <a class="page-scroll" href="https://twitter.com/osempossum" title="Follow us on Twitter">
+                      <i class="fa fa-twitter"></i>
+                    </a>
                 </li>
                 <li>
-                    <a href="/blog">Blog</a>
+                    <a href="/blog" title="Blog">
+                      <i class="fa fa-rss"></i>
+                    </a>
                 </li>
             </ul>
         </div>