diff --git a/codan/org.eclipse.cdt.codan.ui/icons/blue_bug.gif b/codan/org.eclipse.cdt.codan.ui/icons/blue_bug.gif
new file mode 100644
index 00000000000..fcdd4330e61
Binary files /dev/null and b/codan/org.eclipse.cdt.codan.ui/icons/blue_bug.gif differ
diff --git a/codan/org.eclipse.cdt.codan.ui/icons/quick_fix.gif b/codan/org.eclipse.cdt.codan.ui/icons/quick_fix.gif
new file mode 100644
index 00000000000..8b0ac1d6f16
Binary files /dev/null and b/codan/org.eclipse.cdt.codan.ui/icons/quick_fix.gif differ
diff --git a/codan/org.eclipse.cdt.codan.ui/icons/red_bug.gif b/codan/org.eclipse.cdt.codan.ui/icons/red_bug.gif
new file mode 100644
index 00000000000..31a35d64168
Binary files /dev/null and b/codan/org.eclipse.cdt.codan.ui/icons/red_bug.gif differ
diff --git a/codan/org.eclipse.cdt.codan.ui/icons/red_bug_assist.gif b/codan/org.eclipse.cdt.codan.ui/icons/red_bug_assist.gif
new file mode 100644
index 00000000000..6ad432656f4
Binary files /dev/null and b/codan/org.eclipse.cdt.codan.ui/icons/red_bug_assist.gif differ
diff --git a/codan/org.eclipse.cdt.codan.ui/icons/yellow_bug.gif b/codan/org.eclipse.cdt.codan.ui/icons/yellow_bug.gif
new file mode 100644
index 00000000000..f21e7522919
Binary files /dev/null and b/codan/org.eclipse.cdt.codan.ui/icons/yellow_bug.gif differ
diff --git a/codan/org.eclipse.cdt.codan.ui/icons/yellow_bug_assist.gif b/codan/org.eclipse.cdt.codan.ui/icons/yellow_bug_assist.gif
new file mode 100644
index 00000000000..10285bfa999
Binary files /dev/null and b/codan/org.eclipse.cdt.codan.ui/icons/yellow_bug_assist.gif differ
diff --git a/codan/org.eclipse.cdt.codan.ui/plugin.xml b/codan/org.eclipse.cdt.codan.ui/plugin.xml
index e78dd6171e0..b96944c1edd 100644
--- a/codan/org.eclipse.cdt.codan.ui/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.ui/plugin.xml
@@ -200,21 +200,21 @@
       <specification
       		annotationType="org.eclipse.cdt.codan.ui.annotation.error"
             label="%marker.editor.error"
-            icon="icons/error.gif"
-            quickFixIcon="icons/quick_fix_error_obj.gif"
+            icon="icons/red_bug.gif"
+            quickFixIcon="icons/red_bug_assist.gif"
             presentationLayer="6">
       </specification>
             <specification
       		annotationType="org.eclipse.cdt.codan.ui.annotation.warning"
             label="%marker.editor.warning"
-            icon="icons/warning.gif"
-            quickFixIcon="icons/quick_fix_warning_obj.gif"
+            icon="icons/yellow_bug.gif"
+            quickFixIcon="icons/yellow_bug_assist.gif"
             presentationLayer="5">
       </specification>
             <specification
       		annotationType="org.eclipse.cdt.codan.ui.annotation.info"
             label="%marker.editor.info"
-            icon="icons/info.gif"
+            icon="icons/blue_bug.gif"
             presentationLayer="4">
       </specification>
          </extension>