diff --git a/doc/wikiicons/anonymous.png b/doc/wikiicons/anonymous.png
deleted file mode 100644
index df22152e6..000000000
Binary files a/doc/wikiicons/anonymous.png and /dev/null differ
diff --git a/doc/wikiicons/openid.png b/doc/wikiicons/openid.png
deleted file mode 100644
index c5535c3de..000000000
Binary files a/doc/wikiicons/openid.png and /dev/null differ
diff --git a/doc/wikiicons/signedin.png b/doc/wikiicons/signedin.png
deleted file mode 100644
index 969908d39..000000000
Binary files a/doc/wikiicons/signedin.png and /dev/null differ
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index b419404ea..f26cf6d05 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -4,28 +4,20 @@
 By
 
 <TMPL_IF NAME="COMMENTUSER">
-<span class="author">
 <TMPL_IF NAME="COMMENTOPENID">
-
+<span class="author" title="OpenID">
 <a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
-<img src="/wikiicons/openid.png" width="20" height="15" alt="[OpenID]"
-    title="Signed in with OpenID" />
-
+</span>
 <TMPL_ELSE>
-
+<span class="author" title="Signed in">
 <TMPL_IF NAME="COMMENTAUTHORURL">
 <a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR NAME=COMMENTAUTHOR>
-</TMPL_IF>
-<img src="/wikiicons/signedin.png" width="15" height="15" alt="[Signed in]"
-    title="Signed in directly" />
-
 </TMPL_IF>
 </span>
-
+</TMPL_IF>
 <TMPL_ELSE><!-- !COMMENTUSER -->
-
 <TMPL_IF NAME=COMMENTIP>
 <span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
 <TMPL_ELSE><!-- !COMMENTIP -->
@@ -36,9 +28,7 @@ By
 <TMPL_ELSE>
 <TMPL_VAR NAME=AUTHOR>
 </TMPL_IF>
-<img src="/wikiicons/anonymous.png" width="15" height="15" alt="[Unauthenticated]" />
 </span>
-
 </TMPL_IF><!-- !COMMENTUSER -->
 
 (<TMPL_VAR CTIME>)