diff --git a/CHANGELOG.md b/CHANGELOG.md
index adee59fd..34f0697a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Bulma Changelog
 
+## 0.5.2
+
+### Issues closed
+
+* #1063 `$family-primary` customisation
+
 ## 0.5.1
 
 ### New features
diff --git a/docs/_includes/navbar.html b/docs/_includes/navbar.html
index 393bb531..2d08ab8c 100644
--- a/docs/_includes/navbar.html
+++ b/docs/_includes/navbar.html
@@ -153,10 +153,14 @@
 
     <div class="navbar-end">
       <a class="navbar-item is-hidden-desktop-only" href="{{ site.github }}" target="_blank">
-        GitHub
+        <span class="icon" style="color: #333;">
+          <i class="fa fa-github"></i>
+        </span>
       </a>
       <a class="navbar-item is-hidden-desktop-only" href="{{ site.twitter }}" target="_blank">
-        Twitter
+        <span class="icon" style="color: #55acee;">
+          <i class="fa fa-twitter"></i>
+        </span>
       </a>
       <div class="navbar-item">
         <div class="field is-grouped">
diff --git a/sass/base/generic.sass b/sass/base/generic.sass
index 1db291d1..56cb4ec7 100755
--- a/sass/base/generic.sass
+++ b/sass/base/generic.sass
@@ -1,12 +1,12 @@
 $body-background-color: #fff !default
 $body-size: 16px !default
 $body-rendering: optimizeLegibility !default
-$body-family: $family-sans-serif !default
+$body-family: $family-primary !default
 $body-color: $text !default
 $body-weight: $weight-normal !default
 $body-line-height: 1.5 !default
 
-$code-family: $family-monospace !default
+$code-family: $family-code !default
 $code-padding: 0.25em 0.5em 0.25em !default
 $code-weight: normal !default
 $code-size: 0.875em !default