diff --git a/functions/comment-functions.php b/functions/comment-functions.php
index eec4877..0a2577e 100644
--- a/functions/comment-functions.php
+++ b/functions/comment-functions.php
@@ -21,13 +21,7 @@ function comicpress_avatar() {
 
 	$comment_type = get_comment_type();
 
-	if($comment_type == 'trackback') :
-		$avatar = '/images/trackback.png';
-
-	elseif($comment_type == 'pingback') :
-		$avatar = '/images/pingback.png';
-
-	elseif(get_settings('avatar_default')):
+	if(get_settings('avatar_default')):
 		$avatar = get_settings('avatar_default');
 
 	endif;
@@ -41,7 +35,8 @@ function comicpress_avatar() {
 		echo str_replace("alt='", "alt='".wp_specialchars(get_comment_author(), 1)."' title='".wp_specialchars(get_comment_author(), 1), comicpress_get_avatar($id_or_email, 64));
 	} else {
 		if ($comment_type == 'pingback' || $comment_type == 'trackback') {
-			echo '<img src="'.get_template_directory_uri().'/'.$avatar.'" class="photo trackping" />';
+			if ($comment_type == 'pingback') echo '<div class="pingback"></div>';
+			if ($comment_type == 'trackback') echo '<div class="trackback"></div>';
 		} else {
 			echo '<img src="'.get_template_directory_uri().'/'.$avatar.'" class="avatar photo" />';
 		}