diff --git a/include/admin/tpl/comments.inc.tpl b/include/admin/tpl/comments.inc.tpl
index 99107917..9d403df4 100644
--- a/include/admin/tpl/comments.inc.tpl
+++ b/include/admin/tpl/comments.inc.tpl
@@ -180,10 +180,10 @@ function highlightComment(id, checkvalue) {
                         {* TODO: This should not emit an img *}
                         <dd class="action_ip">{$comment.action_ip}</dd>
                         <dt>{$CONST.URL}:</dt>
-                        <dd>{if empty($comment.url)}N/A{else}<a class="link_url" href="{$comment.url|escape}" title="{$comment.url|escape}">{$comment.url|escape|truncate:30:"&hellip;"}</a> {/if}</dd>
+                        <dd>{if empty($comment.url)}N/A{else}<a class="icon_link" href="{$comment.url|escape}" title="{$comment.url|escape}"><span class="icon-link"></span> {$comment.url|escape|truncate:30:"&hellip;"}</a> {/if}</dd>
                         <dd class="action_url">{$comment.action_url}</dd>
                         <dt>{$CONST.REFERER}:</dt>
-                        <dd>{if empty($comment.referer)}N/A{else}<a class="link_url" href="{$comment.referer|escape}" title="{$comment.referer|escape}">{$comment.referer|escape|truncate:30:"&hellip;"}</a>{/if}</dd>
+                        <dd>{if empty($comment.referer)}N/A{else}<a class="icon_link" href="{$comment.referer|escape}" title="{$comment.referer|escape}"><span class="icon-link"></span> {$comment.referer|escape|truncate:30:"&hellip;"}</a>{/if}</dd>
                         <dd class="action_referer">{$comment.action_referer}</dd>
                     </dl>
 
diff --git a/include/admin/tpl/images.inc.tpl b/include/admin/tpl/images.inc.tpl
index 9b880de2..6b417933 100644
--- a/include/admin/tpl/images.inc.tpl
+++ b/include/admin/tpl/images.inc.tpl
@@ -203,9 +203,9 @@
     <ul class="plainList">
     {foreach $folders as $folder}
         <li class="level_{$folder.depth} clearfix">
-            <span class="folder_name">{$folder.name}</span>
-            <a class="link_edit" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryEdit&amp;serendipity[dir]={$folder.relpath|escape:'html'}">{$CONST.EDIT}</a>
-            <a class="link_delete" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryDelete&amp;serendipity[dir]={$folder.relpath|escape:'html'}">{$CONST.DELETE}</a>
+            <span class="folder_name"><span class="icon-folder-open"></span> {$folder.name}</span>
+            <a class="icon_link" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryEdit&amp;serendipity[dir]={$folder.relpath|escape:'html'}" title="{$CONST.EDIT}"><span class="icon-edit"></span><span class="visuallyhidden"> {$CONST.EDIT}</span></a>
+            <a class="icon_link" href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryDelete&amp;serendipity[dir]={$folder.relpath|escape:'html'}" title="{$CONST.DELETE}"><span class="icon-trash"></span><span class="visuallhidden"> {$CONST.DELETE}</span></a>
         </li>
     {/foreach}
     </ul>