diff --git a/assets/css/style.scss b/assets/css/style.scss
index f933bf6..1249067 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -592,11 +592,23 @@ select {
 /* Authorbox */
 .authorbox {
 	@include subarticle-element;
+	@extend .clearfix;
 	line-height: 1.5;
 	display: block;
 	@media screen and (max-width: $break1) {
 		text-align: center;
 	}
+	.author-avatar {
+		float: left;
+		margin: 0 25px 0 0;
+		height: 90px;
+		width: 90px;
+		@media screen and (max-width: $break1) {
+			display: inline-block;
+			float: none;
+			margin: 0 0 20px;
+		}
+	}
 	.author-header {
 		margin-bottom: 10px;
 	}
diff --git a/layouts/partials/authorbox.html b/layouts/partials/authorbox.html
index 5f1f895..e23134b 100644
--- a/layouts/partials/authorbox.html
+++ b/layouts/partials/authorbox.html
@@ -1,16 +1,21 @@
 {{- if .Param "authorbox" }}
 {{- with .Site.Author }}
 <div class="authorbox p-author h-card">
-	{{- if .name }}
+	{{ if .avatar }}
+	<figure class="author-avatar">
+		<img class="u-photo" alt="{{ .name }}" src="{{ .avatar | relURL }}">
+	</figure>
+	{{ end }}
+	{{ if .name }}
 	<div class="author-header">
 		<span class="author-name">{{ T "authorbox_name" }} {{ if .link }}<a href="{{ .link }}" class="p-name u-url" rel="me">{{ .name }}</a>{{ else }}<span class="p-name">{{ .name }}</span>{{ end }}</span>
 	</div>
-	{{- end }}
-	{{- with .bio }}
+	{{ end }}
+	{{ with .bio }}
 	<div class="p-note">
 		{{ . }}
 	</div>
-	{{- end }}
+	{{ end }}
 </div>
 {{- end }}
 {{- end }}
\ No newline at end of file