10 files changed, 13 insertions, 13 deletions
diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php
index dc1337362..30e1cef68 100644
--- a/views/default/annotation/default.php
+++ b/views/default/annotation/default.php
@@ -6,7 +6,7 @@
  */
 
 $owner = get_user($vars['annotation']->owner_guid);
-$icon = elgg_view("profile/icon", array('entity' => $owner, 'size' => 'tiny'));
+$icon = elgg_view_entity_icon($owner, 'tiny');
 
 $info = elgg_view("output/longtext", array("value" => $vars['annotation']->value));
 
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index c55c04c78..04efc6388 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -26,7 +26,7 @@ if (!$entity || !$commenter) {
 
 $friendlytime = elgg_view_friendly_time($comment->time_created);
 
-$commenter_icon = elgg_view("profile/icon", array('entity' => $commenter, 'size' => 'tiny'));
+$commenter_icon = elgg_view_entity_icon($commenter, 'tiny');
 $commenter_link = "<a href=\"{$commenter->getURL()}\">$commenter->name</a>";
 
 $entity_title = $entity->title ? $entity->title : elgg_echo('untitled');
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 2ca129840..2d6a2fec5 100644
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -16,7 +16,7 @@ if (!$user) {
 	return true;
 }
 
-$user_icon = elgg_view("profile/icon", array('entity' => $user, 'size' => 'tiny'));
+$user_icon = elgg_view_entity_icon($user, 'tiny');
 $user_link = elgg_view('output/url', array(
 	'href' => $user->getURL(),
 	'text' => $user->name,
diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php
index 2df452958..3397a219b 100644
--- a/views/default/core/friends/picker.php
+++ b/views/default/core/friends/picker.php
@@ -182,7 +182,7 @@ if (!isset($vars['replacement'])) {
 				}
 
 				//echo "<p>" . $user->name . "</p>";
-				$label = elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny', 'override' => true));
+				$label = elgg_view_entity_icon($friend, 'tiny', array('override' => true));
 				$options[$label] = $friend->getGUID();
 
 				if ($vars['highlight'] == 'all'
diff --git a/views/default/core/friends/tablelist.php b/views/default/core/friends/tablelist.php
index 8cb6efeda..339b9ab1b 100644
--- a/views/default/core/friends/tablelist.php
+++ b/views/default/core/friends/tablelist.php
@@ -25,11 +25,11 @@ if (is_array($vars['entities'])) {
 			if ($entity instanceof ElggEntity) {
 				?>
 				<td style="width:25px;">
-				<div style="width: 25px; margin-bottom: 15px;">
-					<?php echo elgg_view("profile/icon",array('entity' => $entity, 'size' => 'tiny')); ?>
+				<div style="width: 25px;" class="mbl">
+					<?php echo elgg_view_entity_icon($entity, 'tiny'); ?>
 				</div>
 				</td>
-				<td style="width: 200px; padding: 5px;">
+				<td style="width: 200px;" class="pas">
 					<?php echo $entity->name; ?>
 				</td>
 				<?php
diff --git a/views/default/forms/friends/edit.php b/views/default/forms/friends/edit.php
index 194aa5ff7..3eba7e2cb 100644
--- a/views/default/forms/friends/edit.php
+++ b/views/default/forms/friends/edit.php
@@ -33,7 +33,7 @@ $form_body .= "<div>";
 if($vars['collection_members']){
 	$form_body .= elgg_echo("friends:collectionfriends") . "<br />";
 	foreach($vars['collection_members'] as $mem){
-		$form_body .= elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny'));
+		$form_body .= elgg_view_entity_icon($mem, 'tiny');
 		$form_body .= $mem->name;
 	}
 }
diff --git a/views/default/river/item/image.php b/views/default/river/item/image.php
index afb6b4019..9caa44b36 100644
--- a/views/default/river/item/image.php
+++ b/views/default/river/item/image.php
@@ -9,4 +9,4 @@
 
 $subject = $vars['item']->getSubjectEntity();
 
-echo elgg_view("profile/icon", array('entity' => $subject, 'size' => 'small'));
+echo elgg_view_entity_icon($subject, 'small');
diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php
index 5392105d6..4fbd7b01a 100644
--- a/views/default/river/relationship/friend/create.php
+++ b/views/default/river/relationship/friend/create.php
@@ -10,8 +10,8 @@ $params = array(
 	'text' => $object->name,
 );
 $object_link = elgg_view('output/url', $params);
-$subject_icon = elgg_view("profile/icon", array('entity' => $subject, 'size' => 'tiny'));
-$object_icon = elgg_view("profile/icon", array('entity' => $object, 'size' => 'tiny'));
+$subject_icon = elgg_view_entity_icon($subject, 'tiny');
+$object_icon = elgg_view_entity_icon($object, 'tiny');
 
 echo elgg_echo("friends:river:add", array($object_link));
 
diff --git a/views/default/user/default.php b/views/default/user/default.php
index 908b47abe..1e45fccd7 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -8,7 +8,7 @@
 
 $user = $vars['entity'];
 
-$icon = elgg_view('profile/icon', array('entity' => $user, 'size' => 'tiny'));
+$icon = elgg_view_entity_icon($user, 'tiny');
 
 // Simple XFN
 $rel = '';
diff --git a/views/default/widgets/friends/content.php b/views/default/widgets/friends/content.php
index e0385027d..f20f00194 100644
--- a/views/default/widgets/friends/content.php
+++ b/views/default/widgets/friends/content.php
@@ -29,7 +29,7 @@ if (is_array($friends) && sizeof($friends) > 0) {
 
 	foreach($friends as $friend) {
 		echo "<div class=\"widget_friends_singlefriend\" >";
-		echo elgg_view("profile/icon",array('entity' => get_user($friend->guid), 'size' => $size));
+		echo elgg_view_entity_icon(get_user($friend->guid), $size);
 		echo "</div>";
 	}