diff --git a/tests/output/custom/author/alexis-metaireau.html b/tests/output/custom/author/alexis-metaireau.html
index 55dcebc9..c64aacb9 100644
--- a/tests/output/custom/author/alexis-metaireau.html
+++ b/tests/output/custom/author/alexis-metaireau.html
@@ -199,7 +199,7 @@
     
     Page 1 / 2
     
-        <a href=".././author/Alexis Métaireau2.html">&raquo;</a>
+        <a href=".././author/alexis-metaireau2.html">&raquo;</a>
     
 </p>
 
diff --git a/tests/output/custom/author/alexis-metaireau2.html b/tests/output/custom/author/alexis-metaireau2.html
index 48e2ef1c..53f001fa 100644
--- a/tests/output/custom/author/alexis-metaireau2.html
+++ b/tests/output/custom/author/alexis-metaireau2.html
@@ -218,7 +218,7 @@ as well as <strong>inline markup</strong>.</p>
 <p class="paginator">
     
         
-            <a href=".././author/Alexis Métaireau.html">&laquo;</a>
+            <a href=".././author/alexis-metaireau.html">&laquo;</a>
         
     
     Page 2 / 2
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index 3d94200b..29cce82c 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -309,7 +309,10 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
 		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
 		.social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='github.com'],
+		.social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
+		.social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+		.social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
 
 /*
 	About
diff --git a/tests/output/custom/theme/images/icons/delicious.png b/tests/output/custom/theme/images/icons/delicious.png
index c6ce246a..3dccdd84 100644
Binary files a/tests/output/custom/theme/images/icons/delicious.png and b/tests/output/custom/theme/images/icons/delicious.png differ
diff --git a/tests/output/custom/theme/images/icons/facebook.png b/tests/output/custom/theme/images/icons/facebook.png
index a7914b49..74e7ad52 100644
Binary files a/tests/output/custom/theme/images/icons/facebook.png and b/tests/output/custom/theme/images/icons/facebook.png differ
diff --git a/tests/output/custom/theme/images/icons/github.png b/tests/output/custom/theme/images/icons/github.png
new file mode 100644
index 00000000..6c52b486
Binary files /dev/null and b/tests/output/custom/theme/images/icons/github.png differ
diff --git a/tests/output/custom/theme/images/icons/gitorious.png b/tests/output/custom/theme/images/icons/gitorious.png
index 6485f5ec..3eeb3ece 100644
Binary files a/tests/output/custom/theme/images/icons/gitorious.png and b/tests/output/custom/theme/images/icons/gitorious.png differ
diff --git a/tests/output/custom/theme/images/icons/gittip.png b/tests/output/custom/theme/images/icons/gittip.png
index bb12a139..af949625 100644
Binary files a/tests/output/custom/theme/images/icons/gittip.png and b/tests/output/custom/theme/images/icons/gittip.png differ
diff --git a/tests/output/custom/theme/images/icons/google-plus.png b/tests/output/custom/theme/images/icons/google-plus.png
new file mode 100644
index 00000000..3c6b7432
Binary files /dev/null and b/tests/output/custom/theme/images/icons/google-plus.png differ
diff --git a/tests/output/custom/theme/images/icons/lastfm.png b/tests/output/custom/theme/images/icons/lastfm.png
index b09c7876..3a6c6262 100644
Binary files a/tests/output/custom/theme/images/icons/lastfm.png and b/tests/output/custom/theme/images/icons/lastfm.png differ
diff --git a/tests/output/custom/theme/images/icons/linkedin.png b/tests/output/custom/theme/images/icons/linkedin.png
index feb04962..d29c1201 100644
Binary files a/tests/output/custom/theme/images/icons/linkedin.png and b/tests/output/custom/theme/images/icons/linkedin.png differ
diff --git a/tests/output/custom/theme/images/icons/rss.png b/tests/output/custom/theme/images/icons/rss.png
index 7d4e85d9..7862c65a 100644
Binary files a/tests/output/custom/theme/images/icons/rss.png and b/tests/output/custom/theme/images/icons/rss.png differ
diff --git a/tests/output/custom/theme/images/icons/twitter.png b/tests/output/custom/theme/images/icons/twitter.png
index d6119280..d0ef3cc1 100644
Binary files a/tests/output/custom/theme/images/icons/twitter.png and b/tests/output/custom/theme/images/icons/twitter.png differ