diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 6b4c4e1ab7d9b..078b2116085a8 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -742,10 +742,12 @@ function get_studentshtml() {
 
                     // If feedback present, surround grade with feedback tooltip
                     if (!empty($grade->feedback)) {
+                        $overlib = '';
                         if ($grade->feedbackformat == 1) {
                             $overlib = "return overlib('" . s(ltrim($grade->feedback)) . "', FULLHTML);";
                         } else {
-                            $overlib = "return overlib('" . s($grade->feedback) . "', CAPTION, '$strfeedback');";
+                            $overlib = "return overlib('" . s($grade->feedback) . "', BORDER, 0, FGCLASS, 'feedback', "
+                                     . "CAPTIONFONTCLASS, 'caption', CAPTION, '$strfeedback');";
                         }
 
                         $studentshtml .= '<span onmouseover="' . $overlib . '" onmouseout="return nd();">';
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 30d3dd5ca1638..5bda17982ca68 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2130,6 +2130,30 @@ body#doc-contents ul {
   margin-top: 20px;
 }
 
+.grade-report-grader #overDiv table {
+  margin: 0;	
+  
+}
+
+.grade-report-grader #overDiv table td.feedback {
+	border: 0px;
+}
+.grade-report-grader #overDiv .feedback {
+	background-color: #AABBFF;	
+	color: #000000;
+	font-family: Verdana;
+	font-size: 70%;
+	font-weight: normal;	
+}
+
+.grade-report-grader #overDiv .caption {
+	background-color: #5566CC;
+	color: #CCCCFF;
+	font-family: Arial;
+	font-size: 70%;
+	font-weight: bold;	
+}
+
 .grade-report-grader div.submit {
   margin-top: 20px;
   text-align: center;
@@ -2218,6 +2242,16 @@ body#doc-contents ul {
   background-color: #FFFFFF;
   border: #000000 1px dashed;
 }
+
+.gradebook_feedback {
+	display: block;	
+	color: yellow;
+	
+}
+
+.gradebook_feedback_caption {
+	font-size: 2em;
+}
 /* scales edit */
 
 .grade-edit-scale .buttons {