diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php
index 0758a3a3dc..d87af1d935 100644
--- a/calendar/inc/class.calendar_bo.inc.php
+++ b/calendar/inc/class.calendar_bo.inc.php
@@ -1514,16 +1514,16 @@ class calendar_bo
 				switch($status[0])
 				{
 					case 'A':	// accepted
-						$status = html::image('calendar','agt_action_success',$lang_status);
+						$status = html::image('calendar','accepted',$lang_status);
 						break;
 					case 'R':	// rejected
-						$status = html::image('calendar','agt_action_fail',$lang_status);
+						$status = html::image('calendar','rejected',$lang_status);
 						break;
 					case 'T':	// tentative
 						$status = html::image('calendar','tentative',$lang_status);
 						break;
 					case 'U':	// no response = unknown
-						$status = html::image('calendar','cnr-pending',$lang_status);
+						$status = html::image('calendar','needs-action',$lang_status);
 						break;
 					case 'D':	// delegated
 						$status = html::image('calendar','forward',$lang_status);
diff --git a/calendar/templates/default/images/agt_action_success.png b/calendar/templates/default/images/accepted.png
similarity index 100%
rename from calendar/templates/default/images/agt_action_success.png
rename to calendar/templates/default/images/accepted.png
diff --git a/calendar/templates/default/images/cnr-pending.png b/calendar/templates/default/images/needs-action.png
similarity index 100%
rename from calendar/templates/default/images/cnr-pending.png
rename to calendar/templates/default/images/needs-action.png
diff --git a/calendar/templates/default/images/agt_action_fail.png b/calendar/templates/default/images/rejected.png
similarity index 100%
rename from calendar/templates/default/images/agt_action_fail.png
rename to calendar/templates/default/images/rejected.png
diff --git a/calendar/templates/pixelegg/images/agt_action_success.png b/calendar/templates/pixelegg/images/accepted.png
similarity index 100%
rename from calendar/templates/pixelegg/images/agt_action_success.png
rename to calendar/templates/pixelegg/images/accepted.png
diff --git a/calendar/templates/pixelegg/images/cnr-pending.png b/calendar/templates/pixelegg/images/needs-action.png
similarity index 100%
rename from calendar/templates/pixelegg/images/cnr-pending.png
rename to calendar/templates/pixelegg/images/needs-action.png
diff --git a/calendar/templates/pixelegg/images/agt_action_fail.png b/calendar/templates/pixelegg/images/rejected.png
similarity index 100%
rename from calendar/templates/pixelegg/images/agt_action_fail.png
rename to calendar/templates/pixelegg/images/rejected.png