diff --git a/embed/initial/base.html b/embed/initial/base.html
index f61a0be..307b405 100644
--- a/embed/initial/base.html
+++ b/embed/initial/base.html
@@ -53,7 +53,7 @@
 
             <div class="header-profile">
                 {{ if .User.AvatarUrl }}
-                    <img class="u-logo avatar" src="{{ .User.AvatarUrl }}" alt="{{ .User.Config.Title }}" width="100" height="100" />
+                    <img class="u-photo u-logo avatar" src="{{ .User.AvatarUrl }}" alt="{{ .User.Config.Title }}" width="100" height="100" />
                 {{ end }}
                 <div style="float: right; list-style: none;">
                     {{ if .User.Config.TwitterHandle}}
diff --git a/embed/post.html b/embed/post.html
index 36e3cc3..35cfd95 100644
--- a/embed/post.html
+++ b/embed/post.html
@@ -2,15 +2,20 @@
     <hgroup>
         <h1 class="p-name">{{.Title}}</h1>
         <small>
+            <a class="u-url" href="{{.Post.FullUrl}}">#</a>
             Published:
             <time class="dt-published" datetime="{{.Post.Meta.Date}}">
                 {{.Post.Meta.FormattedDate}}
             </time>
             {{ if .Post.User.Config.AuthorName }}
                 by
-                <a class="p-author h-card" href="{{.Post.User.FullUrl}}">{{.Post.User.Config.AuthorName}}</a>
+                <a class="p-author h-card" href="{{.Post.User.FullUrl}}">
+                    {{ if .Post.User.AvatarUrl }}
+                        <img class="u-photo u-logo" style="height: 1em;" src="{{ .Post.User.AvatarUrl }}" alt="{{ .Post.User.Config.Title }}" />
+                    {{ end }}
+                    {{.Post.User.Config.AuthorName}}
+                </a>
             {{ end }}
-            <a class="u-url" href="{{.Post.FullUrl}}">#</a>
         </small> 
     </hgroup>
     <hr>