2 files changed, 7 insertions, 7 deletions
diff --git a/views/default/page/elements/page_links.php b/views/default/page/elements/page_links.php
index fb9acbfb7..bd901ee42 100644
--- a/views/default/page/elements/page_links.php
+++ b/views/default/page/elements/page_links.php
@@ -17,7 +17,7 @@ if (isset($autofeed) && $autofeed == true) {
 	$label = elgg_echo('feed:rss');
 	
 	$rss_link = elgg_view('output/url', array(
-		'text' => '<span class="elgg-icon elgg-icon-rss"></span>',
+		'text' => elgg_view_icon('rss'),
 		'href' => $url,
 		'title' => $label,
 		'rel' => 'nofollow',
diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php
index 987326119..88ffa85e0 100644
--- a/views/default/page/elements/topbar.php
+++ b/views/default/page/elements/topbar.php
@@ -26,8 +26,8 @@ echo elgg_view('output/url', array(
 
 // friends
 echo elgg_view('output/url', array(
-	'href' => elgg_get_site_url() . "pg/friends/{$user->username}/",
-	'text' => '<span class="elgg-icon elgg-icon-friends"></span>',
+	'href' => "pg/friends/{$user->username}/",
+	'text' => elgg_view_icon('friends'),
 	'title' => elgg_echo('friends'),
 ));
 
@@ -51,16 +51,16 @@ echo elgg_view('elgg_topbar/extend', $vars);
 
 // user settings
 echo elgg_view('output/url', array(
-	'href' => elgg_get_site_url() . "pg/settings/user/{$user->username}",
-	'text' => '<span class="elgg-icon elgg-icon-settings"></span>' . elgg_echo('settings'),
+	'href' => "pg/settings/user/{$user->username}",
+	'text' => elgg_view_icon('settings') . elgg_echo('settings'),
 	'class' => 'elgg-alt',
 ));
 
 // The administration link is for admin or site admin users only
 if ($user->isAdmin()) {
 	echo elgg_view('output/url', array(
-		'href' => elgg_get_site_url() . 'pg/admin/',
-		'text' => '<span class="elgg-icon elgg-icon-settings"></span>' . elgg_echo('admin'),
+		'href' => 'pg/admin/',
+		'text' => elgg_view_icon('settings') . elgg_echo('admin'),
 		'class' => 'elgg-alt',
 	));
 }