diff --git a/_includes/footer.html b/_includes/footer.html
index fcb6e9d..c3c656b 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -6,152 +6,167 @@
{% if site.author.facebook and site.footer-links-active.facebook %}
-
+
+ Facebook
{% endif %}
{% if site.author.github and site.footer-links-active.github %}
-
+
+ GitHub
{% endif %}
{% if site.author.twitter and site.footer-links-active.twitter %}
-
+
+ Twitter
{% endif %}
{% if site.author.reddit and site.footer-links-active.reddit %}
-
+
+ Reddit
{% endif %}
{% if site.author.google-plus and site.footer-links-active.google-plus %}
-
+
+ Google+
{% endif %}
{% if site.author.email and site.footer-links-active.email %}
-
+
+ Email me
{% endif %}
{% if site.author.linkedin and site.footer-links-active.linkedin %}
-
+
+ LinkedIn
{% endif %}
{% if site.author.xing and site.footer-links-active.xing %}
-
+
+ Xing
{% endif %}
{% if site.author.stackoverflow and site.footer-links-active.stackoverflow %}
-
+
+ StackOverflow
{% endif %}
{% if site.author.snapchat and site.footer-links-active.snapchat %}
-
+
+ Snapchat
{% endif %}
{% if site.author.instagram and site.footer-links-active.instagram %}
-
+
+ Instagram
{% endif %}
{% if site.author.youtube and site.footer-links-active.youtube %}
-
+
+ YouTube
{% endif %}
{% if site.author.spotify and site.footer-links-active.spotify %}
-
+
+ Spotify
{% endif %}
{% if site.author.telephone and site.footer-links-active.telephone %}
-
+
+ Phone
{% endif %}
{% if site.footer-links-active.rss %}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ RSS
+
+
{% endif %}
diff --git a/_includes/social-share.html b/_includes/social-share.html
index c8a74b2..53d75d0 100644
--- a/_includes/social-share.html
+++ b/_includes/social-share.html
@@ -8,36 +8,41 @@
{% if any-share-links %}
+ Share:
-
{% if site.share-links-active.twitter %}
+
{% endif %}
-
{% if site.share-links-active.facebook %}
+
+ Facebook
{% endif %}
-
{% if site.share-links-active.google %}
+
+ Google+
{% endif %}
-
{% if site.share-links-active.linkedin %}
+
+ LinkedIn
{% endif %}