diff --git a/pelican/tests/output/basic/theme/css/main.css b/pelican/tests/output/basic/theme/css/main.css
index 0295f6b2..24a673dc 100644
--- a/pelican/tests/output/basic/theme/css/main.css
+++ b/pelican/tests/output/basic/theme/css/main.css
@@ -65,6 +65,7 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
+div.line-block,
 p { margin-top: 1em;
     margin-bottom: 1em;}
 
@@ -305,18 +306,28 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	}
 	
 		/* Icons */
+		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
+		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
 		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
 		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-		.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*='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');}
+		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
+		.social a[href*='news.ycombinator.com'],
+		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
+		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
+		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
+		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
+		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
 
 /*
 	About
diff --git a/pelican/tests/output/basic/theme/images/icons/aboutme.png b/pelican/tests/output/basic/theme/images/icons/aboutme.png
new file mode 100644
index 00000000..9609df3b
Binary files /dev/null and b/pelican/tests/output/basic/theme/images/icons/aboutme.png differ
diff --git a/pelican/tests/output/basic/theme/images/icons/bitbucket.png b/pelican/tests/output/basic/theme/images/icons/bitbucket.png
new file mode 100644
index 00000000..d05ba161
Binary files /dev/null and b/pelican/tests/output/basic/theme/images/icons/bitbucket.png differ
diff --git a/pelican/tests/output/basic/theme/images/icons/google-groups.png b/pelican/tests/output/basic/theme/images/icons/google-groups.png
new file mode 100644
index 00000000..5de15e68
Binary files /dev/null and b/pelican/tests/output/basic/theme/images/icons/google-groups.png differ
diff --git a/pelican/tests/output/basic/theme/images/icons/hackernews.png b/pelican/tests/output/basic/theme/images/icons/hackernews.png
new file mode 100644
index 00000000..fc7a82d4
Binary files /dev/null and b/pelican/tests/output/basic/theme/images/icons/hackernews.png differ
diff --git a/pelican/tests/output/basic/theme/images/icons/reddit.png b/pelican/tests/output/basic/theme/images/icons/reddit.png
new file mode 100644
index 00000000..71ae1215
Binary files /dev/null and b/pelican/tests/output/basic/theme/images/icons/reddit.png differ
diff --git a/pelican/tests/output/basic/theme/images/icons/slideshare.png b/pelican/tests/output/basic/theme/images/icons/slideshare.png
new file mode 100644
index 00000000..ecc97410
Binary files /dev/null and b/pelican/tests/output/basic/theme/images/icons/slideshare.png differ
diff --git a/pelican/tests/output/basic/theme/images/icons/speakerdeck.png b/pelican/tests/output/basic/theme/images/icons/speakerdeck.png
new file mode 100644
index 00000000..087d0931
Binary files /dev/null and b/pelican/tests/output/basic/theme/images/icons/speakerdeck.png differ
diff --git a/pelican/tests/output/basic/theme/images/icons/vimeo.png b/pelican/tests/output/basic/theme/images/icons/vimeo.png
new file mode 100644
index 00000000..dba47202
Binary files /dev/null and b/pelican/tests/output/basic/theme/images/icons/vimeo.png differ
diff --git a/pelican/tests/output/basic/theme/images/icons/youtube.png b/pelican/tests/output/basic/theme/images/icons/youtube.png
new file mode 100644
index 00000000..ce6cbe4f
Binary files /dev/null and b/pelican/tests/output/basic/theme/images/icons/youtube.png differ
diff --git a/pelican/tests/output/custom/theme/css/main.css b/pelican/tests/output/custom/theme/css/main.css
index 0295f6b2..24a673dc 100644
--- a/pelican/tests/output/custom/theme/css/main.css
+++ b/pelican/tests/output/custom/theme/css/main.css
@@ -65,6 +65,7 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
+div.line-block,
 p { margin-top: 1em;
     margin-bottom: 1em;}
 
@@ -305,18 +306,28 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	}
 	
 		/* Icons */
+		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
+		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
 		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
 		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-		.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*='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');}
+		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
+		.social a[href*='news.ycombinator.com'],
+		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
+		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
+		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
+		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
+		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
 
 /*
 	About
diff --git a/pelican/tests/output/custom/theme/images/icons/aboutme.png b/pelican/tests/output/custom/theme/images/icons/aboutme.png
new file mode 100644
index 00000000..9609df3b
Binary files /dev/null and b/pelican/tests/output/custom/theme/images/icons/aboutme.png differ
diff --git a/pelican/tests/output/custom/theme/images/icons/bitbucket.png b/pelican/tests/output/custom/theme/images/icons/bitbucket.png
new file mode 100644
index 00000000..d05ba161
Binary files /dev/null and b/pelican/tests/output/custom/theme/images/icons/bitbucket.png differ
diff --git a/pelican/tests/output/custom/theme/images/icons/google-groups.png b/pelican/tests/output/custom/theme/images/icons/google-groups.png
new file mode 100644
index 00000000..5de15e68
Binary files /dev/null and b/pelican/tests/output/custom/theme/images/icons/google-groups.png differ
diff --git a/pelican/tests/output/custom/theme/images/icons/hackernews.png b/pelican/tests/output/custom/theme/images/icons/hackernews.png
new file mode 100644
index 00000000..fc7a82d4
Binary files /dev/null and b/pelican/tests/output/custom/theme/images/icons/hackernews.png differ
diff --git a/pelican/tests/output/custom/theme/images/icons/reddit.png b/pelican/tests/output/custom/theme/images/icons/reddit.png
new file mode 100644
index 00000000..71ae1215
Binary files /dev/null and b/pelican/tests/output/custom/theme/images/icons/reddit.png differ
diff --git a/pelican/tests/output/custom/theme/images/icons/slideshare.png b/pelican/tests/output/custom/theme/images/icons/slideshare.png
new file mode 100644
index 00000000..ecc97410
Binary files /dev/null and b/pelican/tests/output/custom/theme/images/icons/slideshare.png differ
diff --git a/pelican/tests/output/custom/theme/images/icons/speakerdeck.png b/pelican/tests/output/custom/theme/images/icons/speakerdeck.png
new file mode 100644
index 00000000..087d0931
Binary files /dev/null and b/pelican/tests/output/custom/theme/images/icons/speakerdeck.png differ
diff --git a/pelican/tests/output/custom/theme/images/icons/vimeo.png b/pelican/tests/output/custom/theme/images/icons/vimeo.png
new file mode 100644
index 00000000..dba47202
Binary files /dev/null and b/pelican/tests/output/custom/theme/images/icons/vimeo.png differ
diff --git a/pelican/tests/output/custom/theme/images/icons/youtube.png b/pelican/tests/output/custom/theme/images/icons/youtube.png
new file mode 100644
index 00000000..ce6cbe4f
Binary files /dev/null and b/pelican/tests/output/custom/theme/images/icons/youtube.png differ
diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index 0295f6b2..24a673dc 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -65,6 +65,7 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
+div.line-block,
 p { margin-top: 1em;
     margin-bottom: 1em;}
 
@@ -305,18 +306,28 @@ img.left, figure.left {float: left; margin: 0 2em 2em 0;}
 	}
 	
 		/* Icons */
+		.social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
+		.social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
 		.social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
 		.social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
 		.social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
-		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-		.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*='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');}
+		.social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
+		.social a[href*='news.ycombinator.com'],
+		.social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
+		.social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+		.social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+		.social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
+		.social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
+		.social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
+		.social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+		.social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+		.social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
+		.social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
 
 /*
 	About
diff --git a/pelican/themes/notmyidea/static/images/icons/aboutme.png b/pelican/themes/notmyidea/static/images/icons/aboutme.png
new file mode 100644
index 00000000..9609df3b
Binary files /dev/null and b/pelican/themes/notmyidea/static/images/icons/aboutme.png differ
diff --git a/pelican/themes/notmyidea/static/images/icons/bitbucket.png b/pelican/themes/notmyidea/static/images/icons/bitbucket.png
new file mode 100644
index 00000000..d05ba161
Binary files /dev/null and b/pelican/themes/notmyidea/static/images/icons/bitbucket.png differ
diff --git a/pelican/themes/notmyidea/static/images/icons/google-groups.png b/pelican/themes/notmyidea/static/images/icons/google-groups.png
new file mode 100644
index 00000000..5de15e68
Binary files /dev/null and b/pelican/themes/notmyidea/static/images/icons/google-groups.png differ
diff --git a/pelican/themes/notmyidea/static/images/icons/hackernews.png b/pelican/themes/notmyidea/static/images/icons/hackernews.png
new file mode 100644
index 00000000..fc7a82d4
Binary files /dev/null and b/pelican/themes/notmyidea/static/images/icons/hackernews.png differ
diff --git a/pelican/themes/notmyidea/static/images/icons/reddit.png b/pelican/themes/notmyidea/static/images/icons/reddit.png
new file mode 100644
index 00000000..71ae1215
Binary files /dev/null and b/pelican/themes/notmyidea/static/images/icons/reddit.png differ
diff --git a/pelican/themes/notmyidea/static/images/icons/slideshare.png b/pelican/themes/notmyidea/static/images/icons/slideshare.png
new file mode 100644
index 00000000..ecc97410
Binary files /dev/null and b/pelican/themes/notmyidea/static/images/icons/slideshare.png differ
diff --git a/pelican/themes/notmyidea/static/images/icons/speakerdeck.png b/pelican/themes/notmyidea/static/images/icons/speakerdeck.png
new file mode 100644
index 00000000..087d0931
Binary files /dev/null and b/pelican/themes/notmyidea/static/images/icons/speakerdeck.png differ
diff --git a/pelican/themes/notmyidea/static/images/icons/vimeo.png b/pelican/themes/notmyidea/static/images/icons/vimeo.png
new file mode 100644
index 00000000..dba47202
Binary files /dev/null and b/pelican/themes/notmyidea/static/images/icons/vimeo.png differ
diff --git a/pelican/themes/notmyidea/static/images/icons/youtube.png b/pelican/themes/notmyidea/static/images/icons/youtube.png
new file mode 100644
index 00000000..ce6cbe4f
Binary files /dev/null and b/pelican/themes/notmyidea/static/images/icons/youtube.png differ
diff --git a/tests/output/basic/theme/images/icons/google-groups.png b/tests/output/basic/theme/images/icons/google-groups.png
new file mode 100644
index 00000000..5de15e68
Binary files /dev/null and b/tests/output/basic/theme/images/icons/google-groups.png differ
diff --git a/tests/output/basic/theme/images/icons/vimeo.png b/tests/output/basic/theme/images/icons/vimeo.png
new file mode 100644
index 00000000..dba47202
Binary files /dev/null and b/tests/output/basic/theme/images/icons/vimeo.png differ
diff --git a/tests/output/basic/theme/images/icons/youtube.png b/tests/output/basic/theme/images/icons/youtube.png
new file mode 100644
index 00000000..ce6cbe4f
Binary files /dev/null and b/tests/output/basic/theme/images/icons/youtube.png differ
diff --git a/tests/output/custom/theme/images/icons/google-groups.png b/tests/output/custom/theme/images/icons/google-groups.png
new file mode 100644
index 00000000..5de15e68
Binary files /dev/null and b/tests/output/custom/theme/images/icons/google-groups.png differ
diff --git a/tests/output/custom/theme/images/icons/vimeo.png b/tests/output/custom/theme/images/icons/vimeo.png
new file mode 100644
index 00000000..dba47202
Binary files /dev/null and b/tests/output/custom/theme/images/icons/vimeo.png differ
diff --git a/tests/output/custom/theme/images/icons/youtube.png b/tests/output/custom/theme/images/icons/youtube.png
new file mode 100644
index 00000000..ce6cbe4f
Binary files /dev/null and b/tests/output/custom/theme/images/icons/youtube.png differ