diff --git a/alchemy/templates/article.html b/alchemy/templates/article.html
index 089fded..6ce254f 100644
--- a/alchemy/templates/article.html
+++ b/alchemy/templates/article.html
@@ -17,25 +17,33 @@
 <article class="article">
   <header>
     <ul class="list-inline">
-      <li class="text-muted" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</li>
-      <li>&middot;</li>
-      <li><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></li>
-      {% if article.authors and ARTICLE_AUTHORS %}
-      <li>&middot;</li>
-      <li>By
-        {% for author in article.authors %}
-        <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %}
-        {% endfor %}
+      <li class="text-muted" title="{{ article.date.isoformat() }}">
+        <i class="fa fa-fw fa-clock-o"></i>
+        {{ article.locale_date }}
+      </li>
+      <li>&middot;</li>
+      <li>
+        <i class="fa fa-fw fa-folder-open"></i>
+        <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
       </li>
-      {% endif %}
       {% if article.tags %}
       <li>&middot;</li>
       <li>
+        <i class="fa fa-fw fa-tags"></i>
         {% for tag in article.tags %}
         <a href="{{ SITEURL }}/{{ tag.url }}">#{{ tag }}</a>{% if not loop.last %}, {% endif %}
         {% endfor %}
       </li>
       {% endif %}
+      {% if article.authors and ARTICLE_AUTHORS %}
+      <li>&middot;</li>
+      <li>
+        <i class="fa fa-fw fa-users"></i>
+        {% for author in article.authors %}
+        <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %}
+        {% endfor %}
+      </li>
+      {% endif %}
     </ul>
   </header>
   {{ article.content }}
diff --git a/alchemy/templates/index.html b/alchemy/templates/index.html
index bc4ff5c..b50ac6d 100644
--- a/alchemy/templates/index.html
+++ b/alchemy/templates/index.html
@@ -20,7 +20,7 @@ All Articles
     <div class="text-muted" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</div>
     <div><a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></div>
     {% if article.authors and ARTICLE_AUTHORS %}
-    <div>By
+    <div>
       {% for author in article.authors %}
       <a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %}
       {% endfor %}