diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 99abc9c3975..f32789b602c 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1169,7 +1169,11 @@ class assignment_base {
                 $final_grade = $grading_info->items[0]->grades[$auser->id];
                 $grademax = $grading_info->items[0]->grademax;
                 $final_grade->formatted_grade = round($final_grade->grade,2) .' / ' . round($grademax,2);
-                
+                $locked_overridden = 'locked';
+                if ($final_grade->overridden) {
+                    $locked_overridden = 'overridden';
+                }
+
             /// Calculate user status
                 $auser->status = ($auser->timemarked > 0) && ($auser->timemarked >= $auser->timemodified);
                 $picture = print_user_picture($auser, $course->id, $auser->picture, false, true);
@@ -1193,7 +1197,7 @@ class assignment_base {
                         $teachermodified = '<div id="tt'.$auser->id.'">'.userdate($auser->timemarked).'</div>';
 
                         if ($final_grade->locked or $final_grade->overridden) {
-                            $grade = '<div id="g'.$auser->id.'">'.$final_grade->formatted_grade.'</div>';
+                            $grade = '<div id="g'.$auser->id.'" class="'. $locked_overridden .'">'.$final_grade->formatted_grade.'</div>';
                         } else if ($quickgrade) {
                             $menu = choose_from_menu(make_grades_menu($this->assignment->grade),
                                                      'menu['.$auser->id.']', $auser->grade,
@@ -1206,7 +1210,7 @@ class assignment_base {
                     } else {
                         $teachermodified = '<div id="tt'.$auser->id.'">&nbsp;</div>';
                         if ($final_grade->locked or $final_grade->overridden) {
-                            $grade = '<div id="g'.$auser->id.'">'.$final_grade->formatted_grade.'</div>';
+                            $grade = '<div id="g'.$auser->id.'" class="'. $locked_overridden .'">'.$final_grade->formatted_grade.'</div>';
                         } else if ($quickgrade) {
                             $menu = choose_from_menu(make_grades_menu($this->assignment->grade),
                                                      'menu['.$auser->id.']', $auser->grade,
diff --git a/mod/assignment/styles.php b/mod/assignment/styles.php
index 54f310994e2..84a0442cf3b 100644
--- a/mod/assignment/styles.php
+++ b/mod/assignment/styles.php
@@ -161,16 +161,16 @@
 }
 
 #mod-assignment-submissions .qgprefs #optiontable {
-    text-align:right;
-    margin-left:auto;
+  text-align:right;
+  margin-left:auto;
 }
 
 #mod-assignment-submissions .fgcontrols {
-    margin-top: 1em;
-    text-align:center;
+  margin-top: 1em;
+  text-align:center;
 }
 
 #mod-assignment-submissions .fgcontrols .fastgbutton{
-    margin-top: 0.5em;
+  margin-top: 0.5em;
 }
 
diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index 4e56b90e500..d1771990f23 100644
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -731,6 +731,10 @@ body#grade-index .grades .r1 {
   background-color: #f0f0f0;
 }
 
+td.grade div.overridden {
+  background-color: #DDDDDD;
+}
+
 /* grade edit */
 
 .grade-edit-tree .moving {