diff --git a/icons/CCR.png b/icons/CCR.png
new file mode 100644
index 000000000..9f29c0854
Binary files /dev/null and b/icons/CCR.png differ
diff --git a/icons/OC.png b/icons/OC.png
new file mode 100644
index 000000000..6c4e7a7ff
Binary files /dev/null and b/icons/OC.png differ
diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp
index f3c81f102..7e7c602a1 100644
--- a/profile-widget/diveeventitem.cpp
+++ b/profile-widget/diveeventitem.cpp
@@ -84,6 +84,10 @@ void DiveEventItem::setupPixmap(struct gasmix *lastgasmix)
 #define EVENT_PIXMAP_BIGGER(PIX) QPixmap(QString(PIX)).scaled(sz_bigger, sz_bigger, Qt::KeepAspectRatio, Qt::SmoothTransformation)
 	if (empty_string(internalEvent->name)) {
 		setPixmap(EVENT_PIXMAP(":status-warning-icon"));
+	} else if (same_string_caseinsensitive(internalEvent->name, "OC")) {
+		setPixmap(EVENT_PIXMAP(":bailout-icon"));
+	} else if (same_string_caseinsensitive(internalEvent->name, "CCR") || same_string_caseinsensitive(internalEvent->name, "PSCR")) { 
+			setPixmap(EVENT_PIXMAP(":onCCRLoop-icon"));
 	} else if (internalEvent->type == SAMPLE_EVENT_BOOKMARK) {
 		setPixmap(EVENT_PIXMAP(":dive-bookmark-icon"));
 	} else if (event_is_gaschange(internalEvent)) {
diff --git a/subsurface.qrc b/subsurface.qrc
index e15ec2077..c4d43b2fe 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -41,6 +41,8 @@
         <file alias="gaschange-ean-ICD-icon">icons/Nx_changeICD.png</file>
         <file alias="gaschange-trimix-ICD-icon">icons/Tmx_changeICD.png</file>
         <file alias="gaschange-oxygen-ICD-icon">icons/Oxy_changeICD.png</file>
+        <file alias="onCCRLoop-icon">icons/CCR.png</file>
+        <file alias="bailout-icon">icons/OC.png</file>
         <file alias="dive-bookmark-icon">icons/flag.png</file>
         <file alias="scale-icon">icons/scale.png</file>
         <file alias="ruler-icon">icons/ruler.png</file>