diff -Naur mod/scorm/datamodels/aicclib.php mod/scorm/datamodels/aicclib.php
--- mod/scorm/datamodels/aicclib.php	2010-09-15 12:20:53.833672600 +0200
+++ mod/scorm/datamodels/aicclib.php	2010-09-15 12:22:27.841860800 +0200
@@ -448,8 +448,8 @@
                             $score = '('.get_string('score','scorm').': '.$usertrack->score_raw.')';
                         }
                         $strsuspended = get_string('suspended','scorm');
-                        if (isset($usertrack->{'cmi.core.exit'}) && ($usertrack->{'cmi.core.exit'} == 'suspend')) {
-                            $statusicon = '<img src="'.$scormpixdir.'/suspend.gif" alt="'.$strstatus.' - '.$strsuspended.'" title="'.$strstatus.' - '.$strsuspended.'" />';
+                        if (isset($usertrack->{'cmi.core.exit'}) && ($usertrack->{'cmi.core.exit'} == 'suspend') && $incomplete==true) {
+                            $statusicon .= '<img src="'.$scormpixdir.'/suspend.gif" alt="'.$strsuspended.'" title="'.$strsuspended.'" />';
                         }
                     } else {
                         if ($play && empty($scoid)) {
diff -Naur mod/scorm/datamodels/scorm_12lib.php mod/scorm/datamodels/scorm_12lib.php
--- mod/scorm/datamodels/scorm_12lib.php	2010-09-15 12:20:28.849406100 +0200
+++ mod/scorm/datamodels/scorm_12lib.php	2010-09-15 12:22:14.422226000 +0200
@@ -247,10 +247,8 @@
                             $score = '('.get_string('score','scorm').':&nbsp;'.$usertrack->score_raw.')';
                         }
                         $strsuspended = get_string('suspended','scorm');
-                        if (isset($usertrack->{'cmi.core.exit'}) && ($usertrack->{'cmi.core.exit'} == 'suspend')) {
-                            if($usertrack->status !='completed') {
-                                $statusicon = '<img src="'.$scormpixdir.'/suspend.gif" alt="'.$strstatus.' - '.$strsuspended.'" title="'.$strstatus.' - '.$strsuspended.'" />';
-                            }
+                        if (isset($usertrack->{'cmi.core.exit'}) && ($usertrack->{'cmi.core.exit'} == 'suspend') && $incomplete==true) {
+                            $statusicon .= '<img src="'.$scormpixdir.'/suspend.gif" alt="'.$strsuspended.'" title="'.$strsuspended.'" />';
                         }
                     } else {
                         if ($play && empty($scoid)) {
diff -Naur mod/scorm/datamodels/scorm_13lib.php mod/scorm/datamodels/scorm_13lib.php
--- mod/scorm/datamodels/scorm_13lib.php	2010-09-15 10:27:07.717446100 +0200
+++ mod/scorm/datamodels/scorm_13lib.php	2010-09-15 12:21:55.090444400 +0200
@@ -139,10 +139,8 @@
                             $score = '('.get_string('score','scorm').':&nbsp;'.$usertrack->score_raw.')';
                         }
                         $strsuspended = get_string('suspended','scorm');
-                        if (isset($usertrack->{'cmi.core.exit'}) && ($usertrack->{'cmi.core.exit'} == 'suspend')) {
-                            if($usertrack->status !='completed') {
-                                $statusicon = '<img src="'.$scormpixdir.'/suspend.gif" alt="'.$strstatus.' - '.$strsuspended.'" title="'.$strstatus.' - '.$strsuspended.'" />';
-                            }
+                        if (isset($usertrack->{'cmi.exit'}) && ($usertrack->{'cmi.exit'} == 'suspend') && $incomplete==true) {
+                            $statusicon .= '<img src="'.$scormpixdir.'/suspend.gif" alt="'.$strsuspended.'" title="'.$strsuspended.'" />';
                         }
                     } else {
                         if ($play && empty($scoid)) {