diff --git a/public/javascripts/app/helpers/handlebars-helpers.js b/public/javascripts/app/helpers/handlebars-helpers.js
index 0adc587c3..ec2ed679a 100644
--- a/public/javascripts/app/helpers/handlebars-helpers.js
+++ b/public/javascripts/app/helpers/handlebars-helpers.js
@@ -4,4 +4,19 @@ Handlebars.registerHelper('t', function(scope, values) {
 
 Handlebars.registerHelper('imageUrl', function(path){
   return app.baseImageUrl() + path;
-})
\ No newline at end of file
+})
+
+Handlebars.registerHelper('linkToPerson', function(context, block) {
+  var html = "<a href=\"/people/" + context.guid + "\" class=\"author-name\">";
+      html+= block.fn(context);
+      html+= "</a>";
+
+  return html
+})
+
+Handlebars.registerHelper('avatar', function(person, size, imageClass) {
+  size = (typeof(size) != "string" ? "small" : size);
+  imageClass = (typeof(imageClass) != "string" ? size : imageClass);
+
+  return "<img src=\"" + person.avatar[size] +"\" class=\"avatar " + imageClass + "\" title=\"" + person.name +"\" />";
+})
diff --git a/public/javascripts/app/templates/comment-stream.handlebars b/public/javascripts/app/templates/comment-stream.handlebars
index 31e462734..d1c327a44 100644
--- a/public/javascripts/app/templates/comment-stream.handlebars
+++ b/public/javascripts/app/templates/comment-stream.handlebars
@@ -15,7 +15,7 @@
     <div class="media new_comment_form_wrapper {{#unless comments_count}} hidden {{/unless}}">
       {{#with current_user}}
         <a href="/people/{{guid}}" class="img">
-          <img src="{{avatar.small}}" class="avatar" />
+          {{{avatar this}}}
         </a>
       {{/with}}
 
diff --git a/public/javascripts/app/templates/post-viewer/author.handlebars b/public/javascripts/app/templates/post-viewer/author.handlebars
index 813d582d2..3b4eb0a8c 100644
--- a/public/javascripts/app/templates/post-viewer/author.handlebars
+++ b/public/javascripts/app/templates/post-viewer/author.handlebars
@@ -1,21 +1,19 @@
 <div class="img">
-  <a href="/people/{{author.guid}}" class="author-name">
-    <img src="{{author.avatar.small}}" class="avatar smaller"/>
-  </a>
+  {{#linkToPerson author}}
+    {{{avatar this "small"}}}
+  {{/linkToPerson}}
 </div>
 
 <div class="bd">
-  <a href="/people/{{author.guid}}" class="author-name">
-    {{author.name}}
-  </a>
+  {{#linkToPerson author}}
+    {{name}}
+  {{/linkToPerson}}
 
   {{#if root}}
     <i class="icon-retweet"></i>
-    {{#with root}}
-      <a href="/people/{{author.guid}}" class="author-name">
-        {{author.name}}
-      </a>
-    {{/with}}
+    {{#linkToPerson root.author}}
+      {{name}}
+    {{/linkToPerson}}
   {{/if}}
 
   <div class="post-time">
diff --git a/public/javascripts/app/templates/post-viewer/comment.handlebars b/public/javascripts/app/templates/post-viewer/comment.handlebars
index e8ee97936..5f766183a 100644
--- a/public/javascripts/app/templates/post-viewer/comment.handlebars
+++ b/public/javascripts/app/templates/post-viewer/comment.handlebars
@@ -1,13 +1,13 @@
 <div class="img">
-  <a href="/people/{{author.guid}}" class="author-name">
-    <img src="{{author.avatar.small}}" class="avatar smaller"/>
-  </a>
+  {{#linkToPerson author}}
+    {{{avatar this "small"}}}
+  {{/linkToPerson}}
 </div>
 
 <div class="bd">
-  <a href="/people/{{author.guid}}" class="author-name">
-    {{author.name}}
-  </a>
+  {{#linkToPerson author}}
+    {{name}}
+  {{/linkToPerson}}
 
   <div class="comment-content">
     {{{text}}}
diff --git a/public/javascripts/app/templates/post-viewer/reactions.handlebars b/public/javascripts/app/templates/post-viewer/reactions.handlebars
index e50842820..85aa688ab 100644
--- a/public/javascripts/app/templates/post-viewer/reactions.handlebars
+++ b/public/javascripts/app/templates/post-viewer/reactions.handlebars
@@ -6,11 +6,9 @@
       </div>
       <div class="bd">
         {{#each likes}}
-          {{#with author}}
-            <a href="/people/{{guid}}">
-              <img src="{{avatar.small}}" class="avatar micro" title="{{name}}"/ >
-            </a>
-          {{/with}}
+          {{#linkToPerson author}}
+            {{{avatar this "small" "micro"}}}
+          {{/linkToPerson}}
         {{/each}}
       </div>
     </div>
@@ -25,11 +23,9 @@
       </div>
       <div class="bd">
         {{#each participations}}
-          {{#with author}}
-            <a href="/people/{{guid}}">
-              <img src="{{avatar.small}}" class="avatar micro" title="{{name}}"/ >
-            </a>
-          {{/with}}
+          {{#linkToPerson author}}
+            {{{avatar this "small" "micro"}}}
+          {{/linkToPerson}}
         {{/each}}
       </div>
     </div>
@@ -44,11 +40,9 @@
       </div>
       <div class="bd">
         {{#each reshares}}
-          {{#with author}}
-            <a href="/people/{{guid}}">
-              <img src="{{avatar.small}}" class="avatar micro" title="{{name}}"/ >
-            </a>
-          {{/with}}
+          {{#linkToPerson author}}
+            {{{avatar this "small" "micro"}}}
+          {{/linkToPerson}}
         {{/each}}
       </div>
     </div>
diff --git a/public/javascripts/app/templates/stream-element.handlebars b/public/javascripts/app/templates/stream-element.handlebars
index 5d9baf2ba..7c2c7542c 100644
--- a/public/javascripts/app/templates/stream-element.handlebars
+++ b/public/javascripts/app/templates/stream-element.handlebars
@@ -19,7 +19,7 @@
 
   {{#with author}}
     <a href="/people/{{guid}}" class="img">
-      <img src="{{avatar.small}}" class="avatar" />
+      {{{avatar this}}}
     </a>
   {{/with}}
 
diff --git a/public/javascripts/app/templates/stream-faces.handlebars b/public/javascripts/app/templates/stream-faces.handlebars
index 779ac7096..68a752adb 100644
--- a/public/javascripts/app/templates/stream-faces.handlebars
+++ b/public/javascripts/app/templates/stream-faces.handlebars
@@ -1,5 +1,5 @@
 {{#people}}
-  <a href="/people/{{guid}}">
-    <img class="avatar" src="{{avatar.small}}" title="{{name}}"/>
-  </a>
+  {{#linkToPerson this}}
+    {{{avatar this "small"}}}
+  {{/linkToPerson}}
 {{/people}}
diff --git a/public/stylesheets/sass/new-templates.scss b/public/stylesheets/sass/new-templates.scss
index 1d219f3a2..565174267 100644
--- a/public/stylesheets/sass/new-templates.scss
+++ b/public/stylesheets/sass/new-templates.scss
@@ -337,7 +337,7 @@ body.idle {
     width: 20px;
   }
 
-  &.smaller {
+  &.small {
     height: 35px;
     width: 35px;
   }