diff --git a/actions/showstream.php b/actions/showstream.php
index 0f4d79d270..1161c92d6b 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -374,12 +374,8 @@ class ShowstreamAction extends StreamAction {
 
 	function show_notice($notice) {
 		$profile = $notice->getProfile();
-		if (common_logged_in()) {
-			$user = common_current_user();
-			$user_profile = $user->getProfile();
-		} else {
-			$user_profile = false;
-		}
+		$user = common_current_user();
+
 		# XXX: RDFa
 		common_element_start('li', array('class' => 'notice_single',
 										 'id' => 'notice-' . $notice->id));
@@ -420,13 +416,15 @@ class ShowstreamAction extends StreamAction {
 								   'class' => 'replybutton'));
 		common_raw('→');
 		common_element_end('a');
-		common_element_end('p');
-		if ($user_profile && $notice->profile_id == $user_profile->id) {
+		if ($user && $notice->profile_id == $user->id) {
 			$deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
-			common_element('a', array('class' => 'deletenotice',
-									 'href' => $deleteurl),
-									  _('delete'));
+			common_element_start('a', array('class' => 'deletenotice',
+											'href' => $deleteurl,
+											'title' => _('delete')));
+			common_raw('×');
+			common_element_end('a');
 		}
+		common_element_end('p');
 		common_element_end('li');
 	}
 }
\ No newline at end of file