diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
index bbb0af951d4a6..c83050901f13a 100644
--- a/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@ -388,10 +388,7 @@ public function __construct(assign $assignment,
 
         // User picture.
         if ($this->hasviewblind || !$this->assignment->is_blind_marking()) {
-            if (!$this->is_downloading()) {
-                $columns[] = 'picture';
-                $headers[] = get_string('pictureofuser');
-            } else {
+            if ($this->is_downloading()) {
                 $columns[] = 'recordid';
                 $headers[] = get_string('recordid', 'assign');
             }
@@ -896,8 +893,8 @@ public function col_picture(stdClass $row) {
     public function col_fullname($row) {
         if (!$this->is_downloading()) {
             $courseid = $this->assignment->get_course()->id;
-            $link = new moodle_url('/user/view.php', array('id' => $row->id, 'course' => $courseid));
-            $fullname = $this->output->action_link($link, $this->assignment->fullname($row));
+            $fullname = $this->output->render(\core_user::get_profile_picture($row, null,
+                ['courseid' => $courseid, 'includefullname' => true]));
         } else {
             $fullname = $this->assignment->fullname($row);
         }
diff --git a/mod/assign/styles.css b/mod/assign/styles.css
index 07db38c778b8f..a8c38ce061061 100644
--- a/mod/assign/styles.css
+++ b/mod/assign/styles.css
@@ -285,6 +285,10 @@
     white-space: nowrap;
 }
 
+.path-mod-assign .gradingtable .d-inline-block {
+    white-space: nowrap;
+}
+
 .path-mod-assign .gradingtable .moodle-actionmenu[data-enhanced].show .menu a {
     padding-left: 12px;
     padding-right: 12px;