diff --git a/blocks/messages/block_messages.php b/blocks/messages/block_messages.php
index 7e54676b504..b9c4b6dbdfd 100644
--- a/blocks/messages/block_messages.php
+++ b/blocks/messages/block_messages.php
@@ -41,7 +41,7 @@ class block_messages extends block_base {
             foreach ($users as $user) {
                 $timeago = format_time(time() - $user->lastaccess);
                 $this->content->text .= '<li class="listentry"><div class="user"><a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.SITEID.'" title="'.$timeago.'">';
-                $this->content->text .= print_user_picture($user, SITEID, $user->picture, 0, true, false, '', false);
+                $this->content->text .= $OUTPUT->user_picture(moodle_user_picture::make($user, SITEID));
                 $this->content->text .= fullname($user).'</a></div>';
                 $this->content->text .= '<div class="message"><a href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\'; return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img class="iconsmall" src="'.$OUTPUT->old_icon_url('t/message') . '" alt="" />&nbsp;'.$user->count.'</a>';
                 $this->content->text .= '</div></li>';
diff --git a/blocks/online_users/block_online_users.php b/blocks/online_users/block_online_users.php
index c850cc2cb4c..b130e415923 100644
--- a/blocks/online_users/block_online_users.php
+++ b/blocks/online_users/block_online_users.php
@@ -140,13 +140,16 @@ class block_online_users extends block_base {
             foreach ($users as $user) {
                 $this->content->text .= '<li class="listentry">';
                 $timeago = format_time(time() - $user->lastaccess); //bruno to calculate correctly on frontpage
+                $userpic = moodle_user_picture::make($user, $this->page->course->id);
+                $userpic->size = 16;
+                
                 if ($user->username == 'guest') {
-                    $this->content->text .= '<div class="user">'.print_user_picture($user->id, $this->page->course->id, $user->picture, 16, true, false, '', false);
+                    $this->content->text .= '<div class="user">'.$OUTPUT->user_picture($userpic);
                     $this->content->text .= get_string('guestuser').'</div>';
 
                 } else {
                     $this->content->text .= '<div class="user"><a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.$this->page->course->id.'" title="'.$timeago.'">';
-                    $this->content->text .= print_user_picture($user->id, $this->page->course->id, $user->picture, 16, true, false, '', false);
+                    $this->content->text .= '<div class="user">'.$OUTPUT->user_picture($userpic);
                     $this->content->text .= $user->fullname.'</a></div>';
                 }
                 if ($canshowicon and ($USER->id != $user->id) and  $user->username != 'guest') {  // Only when logged in and messaging active etc