diff --git a/templates/default/entity/annotations/image.tpl.php b/templates/default/entity/annotations/image.tpl.php
new file mode 100644
index 0000000000..d823cdd770
--- /dev/null
+++ b/templates/default/entity/annotations/image.tpl.php
@@ -0,0 +1,3 @@
+<a href="<?php echo strip_tags($annotation['owner_url']) ?>" rel="nofollow" class="icon-container"><img
+        src="<?php echo \Idno\Core\Idno::site()->config()->sanitizeAttachmentURL(strip_tags($annotation['owner_image'])) ?>"
+        alt="<?php echo htmlentities($annotation['owner_name']) ?>"/></a>
\ No newline at end of file
diff --git a/templates/default/entity/annotations/likes.tpl.php b/templates/default/entity/annotations/likes.tpl.php
index ae5db5b2f5..778a9e017a 100644
--- a/templates/default/entity/annotations/likes.tpl.php
+++ b/templates/default/entity/annotations/likes.tpl.php
@@ -17,13 +17,13 @@
             <div class="idno-annotation row">
                 <div class="idno-annotation-image col-md-1 hidden-sm">
                     <p>
-                        <a href="<?php echo htmlspecialchars($annotation['owner_url']) ?>" class="icon-container" rel="nofollow"><img src="<?php echo \Idno\Core\Idno::site()->config()->sanitizeAttachmentURL($annotation['owner_image'])?>" /></a>
+                        <?php echo $this->__(['annotation' => $annotation])->draw('entity/annotations/image'); ?>
                     </p>
                 </div>
                 <div class="idno-annotation-content col-md-6">
                     <p>
                         <a href="<?php echo htmlspecialchars($annotation['owner_url'])?>" rel="nofollow"><?php echo htmlentities($annotation['owner_name'], ENT_QUOTES, 'UTF-8')?></a>
-                    <?php echo \Idno\Core\Idno::site()->language()->_('liked this post'); ?>
+                        <?php echo \Idno\Core\Idno::site()->language()->_('liked this post'); ?>
                     </p>
                     <p><small><a href="<?php echo htmlspecialchars($permalink) ?>" rel="nofollow"><?php echo date('M d Y', $annotation['time']);?></a> on <a href="<?php echo htmlspecialchars($permalink) ?>" rel="nofollow"><?php echo parse_url($permalink, PHP_URL_HOST)?></a></small></p>
                 </div>
diff --git a/templates/default/entity/annotations/mentions.tpl.php b/templates/default/entity/annotations/mentions.tpl.php
index 52aad1ccad..e75a672fce 100644
--- a/templates/default/entity/annotations/mentions.tpl.php
+++ b/templates/default/entity/annotations/mentions.tpl.php
@@ -13,7 +13,7 @@
             <div class="idno-annotation row">
                 <div class="idno-annotation-image col-md-1 hidden-sm">
                     <p>
-                        <a href="<?php echo htmlspecialchars($annotation['owner_url'])?>" rel="nofollow" class="icon-container"><img src="<?php echo \Idno\Core\Idno::site()->config()->sanitizeAttachmentURL($annotation['owner_image'])?>" /></a>
+                        <?php echo $this->__(['annotation' => $annotation])->draw('entity/annotations/image'); ?>
                     </p>
                 </div>
                 <div class="idno-annotation-content col-md-6">
diff --git a/templates/default/entity/annotations/replies.tpl.php b/templates/default/entity/annotations/replies.tpl.php
index 49fffd23e8..00ec60368e 100644
--- a/templates/default/entity/annotations/replies.tpl.php
+++ b/templates/default/entity/annotations/replies.tpl.php
@@ -13,8 +13,7 @@
             <div class="idno-annotation row u-comment h-cite">
                 <div class="idno-annotation-image col-md-1 hidden-sm">
                     <p>
-                        <a href="<?php echo strip_tags($annotation['owner_url']) ?>" rel="nofollow" class="icon-container"><img
-                                    src="<?php echo \Idno\Core\Idno::site()->config()->sanitizeAttachmentURL(strip_tags($annotation['owner_image'])) ?>"/></a>
+                        <?php echo $this->__(['annotation' => $annotation])->draw('entity/annotations/image'); ?>
                     </p>
                 </div>
                 <div class="idno-annotation-content col-md-9">
diff --git a/templates/default/entity/annotations/rsvps.tpl.php b/templates/default/entity/annotations/rsvps.tpl.php
index 4b854202aa..4a221feef9 100644
--- a/templates/default/entity/annotations/rsvps.tpl.php
+++ b/templates/default/entity/annotations/rsvps.tpl.php
@@ -18,7 +18,7 @@
             <div class="idno-annotation row">
                 <div class="idno-annotation-image col-md-1 hidden-sm">
                     <p>
-                        <a href="<?php echo htmlspecialchars($annotation['owner_url']) ?>" rel="nofollow" class="icon-container"><img src="<?php echo \Idno\Core\Idno::site()->config()->sanitizeAttachmentURL($annotation['owner_image'])?>" /></a>
+                        <?php echo $this->__(['annotation' => $annotation])->draw('entity/annotations/image'); ?>
                     </p>
                 </div>
                 <div class="idno-annotation-content col-md-6">
diff --git a/templates/default/entity/annotations/shares.tpl.php b/templates/default/entity/annotations/shares.tpl.php
index 5d8598b967..67a872c18a 100644
--- a/templates/default/entity/annotations/shares.tpl.php
+++ b/templates/default/entity/annotations/shares.tpl.php
@@ -14,7 +14,7 @@
             <div class="idno-annotation row">
                 <div class="idno-annotation-image col-md-1 hidden-sm">
                     <p>
-                        <a href="<?php echo htmlspecialchars($annotation['owner_url']) ?>" rel="nofollow" class="icon-container"><img src="<?php echo \Idno\Core\Idno::site()->config()->sanitizeAttachmentURL($annotation['owner_image'])?>" /></a>
+                        <?php echo $this->__(['annotation' => $annotation])->draw('entity/annotations/image'); ?>
                     </p>
                 </div>
                 <div class="idno-annotation-content col-md-6">
diff --git a/templates/default/entity/shell.tpl.php b/templates/default/entity/shell.tpl.php
index 7f15ca4565..f63be516b2 100644
--- a/templates/default/entity/shell.tpl.php
+++ b/templates/default/entity/shell.tpl.php
@@ -14,7 +14,7 @@
                 <div class="col-md-1 col-md-offset-1 owner p-author h-card visible-md visible-lg">
                     <p>
                         <a href="<?php echo $owner->getDisplayURL() ?>" class="u-url icon-container">
-                            <img class="u-photo" src="<?php echo $owner->getIcon() ?>"/></a><br/>
+                            <img class="u-photo" src="<?php echo $owner->getIcon() ?>" alt="<?php echo htmlentities($owner->getName()); ?>"/></a><br/>
                         <a href="<?php echo $owner->getDisplayURL() ?>" class="p-name u-url fn"><?php echo htmlentities(strip_tags($owner->getTitle()), ENT_QUOTES, 'UTF-8'); ?></a>
                     </p>
                 </div>
@@ -23,7 +23,7 @@
                     <!--<div class="visible-xs">
                         <p class="p-author author h-card vcard">
                             <a href="<?php echo $owner->getDisplayURL() ?>" class="icon-container"><img
-                                    class="u-logo logo u-photo photo" src="<?php echo $owner->getIcon() ?>"/></a>
+                                    class="u-logo logo u-photo photo" src="<?php echo $owner->getIcon() ?>" alt="<?php echo htmlentities($owner->getName()); ?>"/></a>
                             <a class="p-name fn u-url url" href="<?php echo $owner->getDisplayURL() ?>"><?php echo htmlentities(strip_tags($owner->getTitle()), ENT_QUOTES, 'UTF-8') ?></a>
                             <a class="u-url" href="<?php echo $owner->getDisplayURL() ?>">
                                 </a>