diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index c60e04cbda5..0935680bde8 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -71,6 +71,15 @@ IconsModeDebugActiveColor=ff99aaef
 IconsModeProjetcsActiveColor=ff80c342
 IconsModeAnalyzeActiveColor=ff43adee
 IconsModeHelpActiveColor=fff4be04
+IconsCodeModelKeywordColor=ffaaaaaa
+IconsCodeModelClassColor=ffc0b550
+IconsCodeModelStructColor=ff53b053
+IconsCodeModelFunctionColor=ffd34373
+IconsCodeModelVariableColor=ff2bbbcc
+IconsCodeModelEnumColor=ffc0b550
+IconsCodeModelMacroColor=ff477ba0
+IconsCodeModelOverlayBackgroundColor=88000000
+IconsCodeModelOverlayForegroundColor=ffdcdcdc
 InfoBarBackground=ff505000
 InfoBarText=text
 MenuBarEmptyAreaBackgroundColor=shadowBackground
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index 5a688c7d99d..690f4407d72 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -65,6 +65,15 @@ IconsModeDebugActiveColor=ffffffff
 IconsModeProjetcsActiveColor=ffffffff
 IconsModeAnalyzeActiveColor=ffffffff
 IconsModeHelpActiveColor=ffffffff
+IconsCodeModelKeywordColor=ff777777
+IconsCodeModelClassColor=ffc0b550
+IconsCodeModelStructColor=ff53b053
+IconsCodeModelFunctionColor=fff36393
+IconsCodeModelVariableColor=ff2bbbcc
+IconsCodeModelEnumColor=ffc0b550
+IconsCodeModelMacroColor=ff476ba0
+IconsCodeModelOverlayBackgroundColor=70ffffff
+IconsCodeModelOverlayForegroundColor=ff232425
 InfoBarBackground=ffffffe1
 InfoBarText=ff000000
 MenuBarEmptyAreaBackgroundColor=ffff0000
diff --git a/share/qtcreator/themes/defaultflat.creatortheme b/share/qtcreator/themes/defaultflat.creatortheme
index b151c37aba4..a3bc13a8204 100644
--- a/share/qtcreator/themes/defaultflat.creatortheme
+++ b/share/qtcreator/themes/defaultflat.creatortheme
@@ -75,6 +75,15 @@ IconsModeDebugActiveColor=ff99aaef
 IconsModeProjetcsActiveColor=ff80c342
 IconsModeAnalyzeActiveColor=ff43adee
 IconsModeHelpActiveColor=fff4be04
+IconsCodeModelKeywordColor=ff777777
+IconsCodeModelClassColor=ffc0b550
+IconsCodeModelStructColor=ff53b053
+IconsCodeModelFunctionColor=ffd34373
+IconsCodeModelVariableColor=ff2bbbcc
+IconsCodeModelEnumColor=ffc0b550
+IconsCodeModelMacroColor=ff476ba0
+IconsCodeModelOverlayBackgroundColor=70ffffff
+IconsCodeModelOverlayForegroundColor=ff232425
 InfoBarBackground=ffffffe1
 InfoBarText=text
 MenuBarEmptyAreaBackgroundColor=shadowBackground
diff --git a/src/libs/cplusplus/Icons.cpp b/src/libs/cplusplus/Icons.cpp
index 539516f4881..7a539c67eb8 100644
--- a/src/libs/cplusplus/Icons.cpp
+++ b/src/libs/cplusplus/Icons.cpp
@@ -30,6 +30,8 @@
 #include <cplusplus/Symbols.h>
 #include <cplusplus/Type.h>
 
+#include <utils/icon.h>
+
 using namespace CPlusPlus;
 using CPlusPlus::Icons;
 
@@ -116,97 +118,177 @@ Icons::IconType Icons::iconTypeForSymbol(const Symbol *symbol)
 
 QIcon Icons::iconForType(IconType type)
 {
+    using namespace Utils;
+
+    static const IconMaskAndColor classRelationIcon {
+        QLatin1String(":/codemodel/images/classrelation.png"), Theme::IconsCodeModelOverlayForegroundColor};
+    static const IconMaskAndColor classRelationBackgroundIcon {
+        QLatin1String(":/codemodel/images/classrelationbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
+    static const IconMaskAndColor classMemberFunctionIcon {
+        QLatin1String(":/codemodel/images/classmemberfunction.png"), Theme::IconsCodeModelFunctionColor};
+    static const IconMaskAndColor classMemberVariableIcon {
+        QLatin1String(":/codemodel/images/classmembervariable.png"), Theme::IconsCodeModelVariableColor};
+    static const IconMaskAndColor functionIcon {
+        QLatin1String(":/codemodel/images/member.png"), Theme::IconsCodeModelFunctionColor};
+    static const IconMaskAndColor variableIcon {
+        QLatin1String(":/codemodel/images/member.png"), Theme::IconsCodeModelVariableColor};
+    static const IconMaskAndColor signalIcon {
+        QLatin1String(":/codemodel/images/signal.png"), Theme::IconsCodeModelFunctionColor};
+    static const IconMaskAndColor slotIcon {
+        QLatin1String(":/codemodel/images/slot.png"), Theme::IconsCodeModelFunctionColor};
+    static const IconMaskAndColor protectedIcon {
+        QLatin1String(":/codemodel/images/protected.png"), Theme::IconsCodeModelOverlayForegroundColor};
+    static const IconMaskAndColor protectedBackgroundIcon {
+        QLatin1String(":/codemodel/images/protectedbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
+    static const IconMaskAndColor privateIcon {
+        QLatin1String(":/codemodel/images/private.png"), Theme::IconsCodeModelOverlayForegroundColor};
+    static const IconMaskAndColor privateBackgroundIcon {
+        QLatin1String(":/codemodel/images/privatebackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
+    static const IconMaskAndColor staticIcon {
+        QLatin1String(":/codemodel/images/static.png"), Theme::IconsCodeModelOverlayForegroundColor};
+    static const IconMaskAndColor staticBackgroundIcon {
+        QLatin1String(":/codemodel/images/staticbackground.png"), Theme::IconsCodeModelOverlayBackgroundColor};
+
     switch (type) {
     case ClassIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/class.png"));
+        const static QIcon icon(Icon({
+            classRelationBackgroundIcon, classRelationIcon,
+            {QLatin1String(":/codemodel/images/classparent.png"), Theme::IconsCodeModelClassColor},
+            classMemberFunctionIcon, classMemberVariableIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case StructIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/struct.png"));
+        const static QIcon icon(Icon({
+            classRelationBackgroundIcon, classRelationIcon,
+            {QLatin1String(":/codemodel/images/classparent.png"), Theme::IconsCodeModelStructColor},
+            classMemberFunctionIcon, classMemberVariableIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case EnumIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/enum.png"));
+        const static QIcon icon(Icon({
+            {QLatin1String(":/codemodel/images/enum.png"), Theme::IconsCodeModelEnumColor}
+        }, Icon::Tint).icon());
         return icon;
     }
     case EnumeratorIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/enumerator.png"));
+        const static QIcon icon(Icon({
+            {QLatin1String(":/codemodel/images/enumerator.png"), Theme::IconsCodeModelEnumColor}
+        }, Icon::Tint).icon());
         return icon;
     }
     case FuncPublicIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/func.png"));
+        const static QIcon icon(Icon({
+                functionIcon}, Icon::Tint).icon());
         return icon;
     }
     case FuncProtectedIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/func_prot.png"));
+        const static QIcon icon(Icon({
+                functionIcon, protectedBackgroundIcon, protectedIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case FuncPrivateIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/func_priv.png"));
+        const static QIcon icon(Icon({
+            functionIcon, privateBackgroundIcon, privateIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case FuncPublicStaticIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/func_st.png"));
+        const static QIcon icon(Icon({
+            functionIcon, staticBackgroundIcon, staticIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case FuncProtectedStaticIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/func_prot_st.png"));
+        const static QIcon icon(Icon({
+            functionIcon, staticBackgroundIcon, staticIcon, protectedBackgroundIcon, protectedIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case FuncPrivateStaticIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/func_priv_st.png"));
+        const static QIcon icon(Icon({
+            functionIcon, staticBackgroundIcon, staticIcon, privateBackgroundIcon, privateIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case NamespaceIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/namespace.png"));
+        const static QIcon icon(Icon({
+            {QLatin1String(":/codemodel/images/namespace.png"), Theme::IconsCodeModelKeywordColor}
+        }, Icon::Tint).icon());
         return icon;
     }
     case VarPublicIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/var.png"));
+        const static QIcon icon(Icon({
+            variableIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case VarProtectedIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/var_prot.png"));
+        const static QIcon icon(Icon({
+            variableIcon, protectedBackgroundIcon, protectedIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case VarPrivateIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/var_priv.png"));
+        const static QIcon icon(Icon({
+            variableIcon, privateBackgroundIcon, privateIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case VarPublicStaticIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/var_st.png"));
+        const static QIcon icon(Icon({
+            variableIcon, staticBackgroundIcon, staticIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case VarProtectedStaticIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/var_prot_st.png"));
+        const static QIcon icon(Icon({
+            variableIcon, staticBackgroundIcon, staticIcon, protectedBackgroundIcon, protectedIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case VarPrivateStaticIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/var_priv_st.png"));
+        const static QIcon icon(Icon({
+            variableIcon, staticBackgroundIcon, staticIcon, privateBackgroundIcon, privateIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case SignalIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/signal.png"));
+        const static QIcon icon(Icon({
+            signalIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case SlotPublicIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/slot.png"));
+        const static QIcon icon(Icon({
+            slotIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case SlotProtectedIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/slot_prot.png"));
+        const static QIcon icon(Icon({
+            slotIcon, protectedBackgroundIcon, protectedIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case SlotPrivateIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/slot_priv.png"));
+        const static QIcon icon(Icon({
+            slotIcon, privateBackgroundIcon, privateIcon
+        }, Icon::Tint).icon());
         return icon;
     }
     case KeywordIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/keyword.png"));
+        const static QIcon icon(Icon({
+            {QLatin1String(":/codemodel/images/keyword.png"), Theme::IconsCodeModelKeywordColor}
+        }, Icon::Tint).icon());
         return icon;
     }
     case MacroIconType: {
-        const static QIcon icon(QLatin1String(":/codemodel/images/macro.png"));
+        const static QIcon icon(Icon({
+            {QLatin1String(":/codemodel/images/macro.png"), Theme::IconsCodeModelMacroColor}
+        }, Icon::Tint).icon());
         return icon;
     }
     default:
diff --git a/src/libs/cplusplus/cplusplus.qrc b/src/libs/cplusplus/cplusplus.qrc
index 9b5812d83c1..d0135fdee80 100644
--- a/src/libs/cplusplus/cplusplus.qrc
+++ b/src/libs/cplusplus/cplusplus.qrc
@@ -1,27 +1,42 @@
 <RCC>
     <qresource prefix="/codemodel">
-        <file>images/class.png</file>
-        <file>images/struct.png</file>
         <file>images/enum.png</file>
+        <file>images/enum@2x.png</file>
         <file>images/enumerator.png</file>
-        <file>images/func.png</file>
-        <file>images/func_priv.png</file>
-        <file>images/func_prot.png</file>
+        <file>images/enumerator@2x.png</file>
         <file>images/keyword.png</file>
+        <file>images/keyword@2x.png</file>
         <file>images/macro.png</file>
+        <file>images/macro@2x.png</file>
         <file>images/namespace.png</file>
+        <file>images/namespace@2x.png</file>
         <file>images/signal.png</file>
+        <file>images/signal@2x.png</file>
         <file>images/slot.png</file>
-        <file>images/slot_priv.png</file>
-        <file>images/slot_prot.png</file>
-        <file>images/var.png</file>
-        <file>images/var_priv.png</file>
-        <file>images/var_prot.png</file>
-        <file>images/func_priv_st.png</file>
-        <file>images/func_prot_st.png</file>
-        <file>images/func_st.png</file>
-        <file>images/var_priv_st.png</file>
-        <file>images/var_prot_st.png</file>
-        <file>images/var_st.png</file>
+        <file>images/slot@2x.png</file>
+        <file>images/member.png</file>
+        <file>images/member@2x.png</file>
+        <file>images/private.png</file>
+        <file>images/private@2x.png</file>
+        <file>images/privatebackground.png</file>
+        <file>images/privatebackground@2x.png</file>
+        <file>images/protected.png</file>
+        <file>images/protected@2x.png</file>
+        <file>images/protectedbackground.png</file>
+        <file>images/protectedbackground@2x.png</file>
+        <file>images/static.png</file>
+        <file>images/static@2x.png</file>
+        <file>images/staticbackground.png</file>
+        <file>images/staticbackground@2x.png</file>
+        <file>images/classmemberfunction.png</file>
+        <file>images/classmemberfunction@2x.png</file>
+        <file>images/classmembervariable.png</file>
+        <file>images/classmembervariable@2x.png</file>
+        <file>images/classparent.png</file>
+        <file>images/classparent@2x.png</file>
+        <file>images/classrelation.png</file>
+        <file>images/classrelation@2x.png</file>
+        <file>images/classrelationbackground.png</file>
+        <file>images/classrelationbackground@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/libs/cplusplus/images/class.png b/src/libs/cplusplus/images/class.png
deleted file mode 100644
index 88432d2cb10..00000000000
Binary files a/src/libs/cplusplus/images/class.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/classmemberfunction.png b/src/libs/cplusplus/images/classmemberfunction.png
new file mode 100644
index 00000000000..f97d706e7fa
Binary files /dev/null and b/src/libs/cplusplus/images/classmemberfunction.png differ
diff --git a/src/libs/cplusplus/images/classmemberfunction@2x.png b/src/libs/cplusplus/images/classmemberfunction@2x.png
new file mode 100644
index 00000000000..f30e61336b5
Binary files /dev/null and b/src/libs/cplusplus/images/classmemberfunction@2x.png differ
diff --git a/src/libs/cplusplus/images/classmembervariable.png b/src/libs/cplusplus/images/classmembervariable.png
new file mode 100644
index 00000000000..82f8024b2eb
Binary files /dev/null and b/src/libs/cplusplus/images/classmembervariable.png differ
diff --git a/src/libs/cplusplus/images/classmembervariable@2x.png b/src/libs/cplusplus/images/classmembervariable@2x.png
new file mode 100644
index 00000000000..6f426c3a411
Binary files /dev/null and b/src/libs/cplusplus/images/classmembervariable@2x.png differ
diff --git a/src/libs/cplusplus/images/classparent.png b/src/libs/cplusplus/images/classparent.png
new file mode 100644
index 00000000000..19bb9528428
Binary files /dev/null and b/src/libs/cplusplus/images/classparent.png differ
diff --git a/src/libs/cplusplus/images/classparent@2x.png b/src/libs/cplusplus/images/classparent@2x.png
new file mode 100644
index 00000000000..5ae4e368906
Binary files /dev/null and b/src/libs/cplusplus/images/classparent@2x.png differ
diff --git a/src/libs/cplusplus/images/classrelation.png b/src/libs/cplusplus/images/classrelation.png
new file mode 100644
index 00000000000..acf3c8e2690
Binary files /dev/null and b/src/libs/cplusplus/images/classrelation.png differ
diff --git a/src/libs/cplusplus/images/classrelation@2x.png b/src/libs/cplusplus/images/classrelation@2x.png
new file mode 100644
index 00000000000..6da54dd223e
Binary files /dev/null and b/src/libs/cplusplus/images/classrelation@2x.png differ
diff --git a/src/libs/cplusplus/images/classrelationbackground.png b/src/libs/cplusplus/images/classrelationbackground.png
new file mode 100644
index 00000000000..601c8b33211
Binary files /dev/null and b/src/libs/cplusplus/images/classrelationbackground.png differ
diff --git a/src/libs/cplusplus/images/classrelationbackground@2x.png b/src/libs/cplusplus/images/classrelationbackground@2x.png
new file mode 100644
index 00000000000..530e3d4c1e2
Binary files /dev/null and b/src/libs/cplusplus/images/classrelationbackground@2x.png differ
diff --git a/src/libs/cplusplus/images/enum.png b/src/libs/cplusplus/images/enum.png
index 42a9e83bc76..c7698463704 100644
Binary files a/src/libs/cplusplus/images/enum.png and b/src/libs/cplusplus/images/enum.png differ
diff --git a/src/libs/cplusplus/images/enum@2x.png b/src/libs/cplusplus/images/enum@2x.png
new file mode 100644
index 00000000000..562ac461d30
Binary files /dev/null and b/src/libs/cplusplus/images/enum@2x.png differ
diff --git a/src/libs/cplusplus/images/enumerator.png b/src/libs/cplusplus/images/enumerator.png
index 25fc49c6598..292f387ff54 100644
Binary files a/src/libs/cplusplus/images/enumerator.png and b/src/libs/cplusplus/images/enumerator.png differ
diff --git a/src/libs/cplusplus/images/enumerator@2x.png b/src/libs/cplusplus/images/enumerator@2x.png
new file mode 100644
index 00000000000..705e86be9e8
Binary files /dev/null and b/src/libs/cplusplus/images/enumerator@2x.png differ
diff --git a/src/libs/cplusplus/images/func.png b/src/libs/cplusplus/images/func.png
deleted file mode 100644
index e515e76e61f..00000000000
Binary files a/src/libs/cplusplus/images/func.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/func_priv.png b/src/libs/cplusplus/images/func_priv.png
deleted file mode 100644
index 49dda7dfea0..00000000000
Binary files a/src/libs/cplusplus/images/func_priv.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/func_priv_st.png b/src/libs/cplusplus/images/func_priv_st.png
deleted file mode 100644
index 1d6fa2da795..00000000000
Binary files a/src/libs/cplusplus/images/func_priv_st.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/func_prot.png b/src/libs/cplusplus/images/func_prot.png
deleted file mode 100644
index f8add65e073..00000000000
Binary files a/src/libs/cplusplus/images/func_prot.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/func_prot_st.png b/src/libs/cplusplus/images/func_prot_st.png
deleted file mode 100644
index d023fe1fd21..00000000000
Binary files a/src/libs/cplusplus/images/func_prot_st.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/func_st.png b/src/libs/cplusplus/images/func_st.png
deleted file mode 100644
index 05119102edc..00000000000
Binary files a/src/libs/cplusplus/images/func_st.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/keyword.png b/src/libs/cplusplus/images/keyword.png
index e5a51858d9e..335e63eeafd 100644
Binary files a/src/libs/cplusplus/images/keyword.png and b/src/libs/cplusplus/images/keyword.png differ
diff --git a/src/libs/cplusplus/images/keyword@2x.png b/src/libs/cplusplus/images/keyword@2x.png
new file mode 100644
index 00000000000..bfbe3c49cbc
Binary files /dev/null and b/src/libs/cplusplus/images/keyword@2x.png differ
diff --git a/src/libs/cplusplus/images/macro.png b/src/libs/cplusplus/images/macro.png
index 44776470696..aa621fce042 100644
Binary files a/src/libs/cplusplus/images/macro.png and b/src/libs/cplusplus/images/macro.png differ
diff --git a/src/libs/cplusplus/images/macro@2x.png b/src/libs/cplusplus/images/macro@2x.png
new file mode 100644
index 00000000000..67b5938fc9c
Binary files /dev/null and b/src/libs/cplusplus/images/macro@2x.png differ
diff --git a/src/libs/cplusplus/images/member.png b/src/libs/cplusplus/images/member.png
new file mode 100644
index 00000000000..e974865e93c
Binary files /dev/null and b/src/libs/cplusplus/images/member.png differ
diff --git a/src/libs/cplusplus/images/member@2x.png b/src/libs/cplusplus/images/member@2x.png
new file mode 100644
index 00000000000..d0a22156c05
Binary files /dev/null and b/src/libs/cplusplus/images/member@2x.png differ
diff --git a/src/libs/cplusplus/images/namespace.png b/src/libs/cplusplus/images/namespace.png
index 18d2941572e..b36b2a4acfe 100644
Binary files a/src/libs/cplusplus/images/namespace.png and b/src/libs/cplusplus/images/namespace.png differ
diff --git a/src/libs/cplusplus/images/namespace@2x.png b/src/libs/cplusplus/images/namespace@2x.png
new file mode 100644
index 00000000000..81109db2b35
Binary files /dev/null and b/src/libs/cplusplus/images/namespace@2x.png differ
diff --git a/src/libs/cplusplus/images/private.png b/src/libs/cplusplus/images/private.png
new file mode 100644
index 00000000000..8e25668d805
Binary files /dev/null and b/src/libs/cplusplus/images/private.png differ
diff --git a/src/libs/cplusplus/images/private@2x.png b/src/libs/cplusplus/images/private@2x.png
new file mode 100644
index 00000000000..348785c1ba6
Binary files /dev/null and b/src/libs/cplusplus/images/private@2x.png differ
diff --git a/src/libs/cplusplus/images/privatebackground.png b/src/libs/cplusplus/images/privatebackground.png
new file mode 100644
index 00000000000..0c482e5e3ba
Binary files /dev/null and b/src/libs/cplusplus/images/privatebackground.png differ
diff --git a/src/libs/cplusplus/images/privatebackground@2x.png b/src/libs/cplusplus/images/privatebackground@2x.png
new file mode 100644
index 00000000000..e29934552ed
Binary files /dev/null and b/src/libs/cplusplus/images/privatebackground@2x.png differ
diff --git a/src/libs/cplusplus/images/protected.png b/src/libs/cplusplus/images/protected.png
new file mode 100644
index 00000000000..2c87cf2c09c
Binary files /dev/null and b/src/libs/cplusplus/images/protected.png differ
diff --git a/src/libs/cplusplus/images/protected@2x.png b/src/libs/cplusplus/images/protected@2x.png
new file mode 100644
index 00000000000..ad1c62356c6
Binary files /dev/null and b/src/libs/cplusplus/images/protected@2x.png differ
diff --git a/src/libs/cplusplus/images/protectedbackground.png b/src/libs/cplusplus/images/protectedbackground.png
new file mode 100644
index 00000000000..d3c1b513340
Binary files /dev/null and b/src/libs/cplusplus/images/protectedbackground.png differ
diff --git a/src/libs/cplusplus/images/protectedbackground@2x.png b/src/libs/cplusplus/images/protectedbackground@2x.png
new file mode 100644
index 00000000000..3f129b5ce05
Binary files /dev/null and b/src/libs/cplusplus/images/protectedbackground@2x.png differ
diff --git a/src/libs/cplusplus/images/signal.png b/src/libs/cplusplus/images/signal.png
index 062b6261821..ff712b86190 100644
Binary files a/src/libs/cplusplus/images/signal.png and b/src/libs/cplusplus/images/signal.png differ
diff --git a/src/libs/cplusplus/images/signal@2x.png b/src/libs/cplusplus/images/signal@2x.png
new file mode 100644
index 00000000000..241e3d76342
Binary files /dev/null and b/src/libs/cplusplus/images/signal@2x.png differ
diff --git a/src/libs/cplusplus/images/slot.png b/src/libs/cplusplus/images/slot.png
index f1591d2fdbf..1c06b597270 100644
Binary files a/src/libs/cplusplus/images/slot.png and b/src/libs/cplusplus/images/slot.png differ
diff --git a/src/libs/cplusplus/images/slot@2x.png b/src/libs/cplusplus/images/slot@2x.png
new file mode 100644
index 00000000000..f1a96a773a4
Binary files /dev/null and b/src/libs/cplusplus/images/slot@2x.png differ
diff --git a/src/libs/cplusplus/images/slot_priv.png b/src/libs/cplusplus/images/slot_priv.png
deleted file mode 100644
index 3f5f62a5f6c..00000000000
Binary files a/src/libs/cplusplus/images/slot_priv.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/slot_prot.png b/src/libs/cplusplus/images/slot_prot.png
deleted file mode 100644
index 92a86826630..00000000000
Binary files a/src/libs/cplusplus/images/slot_prot.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/static.png b/src/libs/cplusplus/images/static.png
index 12c244780de..988d55d8257 100644
Binary files a/src/libs/cplusplus/images/static.png and b/src/libs/cplusplus/images/static.png differ
diff --git a/src/libs/cplusplus/images/static@2x.png b/src/libs/cplusplus/images/static@2x.png
new file mode 100644
index 00000000000..93b9d177514
Binary files /dev/null and b/src/libs/cplusplus/images/static@2x.png differ
diff --git a/src/libs/cplusplus/images/staticbackground.png b/src/libs/cplusplus/images/staticbackground.png
new file mode 100644
index 00000000000..314bace86a2
Binary files /dev/null and b/src/libs/cplusplus/images/staticbackground.png differ
diff --git a/src/libs/cplusplus/images/staticbackground@2x.png b/src/libs/cplusplus/images/staticbackground@2x.png
new file mode 100644
index 00000000000..912032dcaed
Binary files /dev/null and b/src/libs/cplusplus/images/staticbackground@2x.png differ
diff --git a/src/libs/cplusplus/images/struct.png b/src/libs/cplusplus/images/struct.png
deleted file mode 100644
index 4b613f68f94..00000000000
Binary files a/src/libs/cplusplus/images/struct.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/var.png b/src/libs/cplusplus/images/var.png
deleted file mode 100644
index 089cfb45e5f..00000000000
Binary files a/src/libs/cplusplus/images/var.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/var_priv.png b/src/libs/cplusplus/images/var_priv.png
deleted file mode 100644
index 8c6cf64fe7b..00000000000
Binary files a/src/libs/cplusplus/images/var_priv.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/var_priv_st.png b/src/libs/cplusplus/images/var_priv_st.png
deleted file mode 100644
index 81ef73f3f94..00000000000
Binary files a/src/libs/cplusplus/images/var_priv_st.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/var_prot.png b/src/libs/cplusplus/images/var_prot.png
deleted file mode 100644
index a7496aada00..00000000000
Binary files a/src/libs/cplusplus/images/var_prot.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/var_prot_st.png b/src/libs/cplusplus/images/var_prot_st.png
deleted file mode 100644
index f078b2fd340..00000000000
Binary files a/src/libs/cplusplus/images/var_prot_st.png and /dev/null differ
diff --git a/src/libs/cplusplus/images/var_st.png b/src/libs/cplusplus/images/var_st.png
deleted file mode 100644
index 2070ca71b6b..00000000000
Binary files a/src/libs/cplusplus/images/var_st.png and /dev/null differ
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
index 884b76104fc..8dd54e5a79c 100644
--- a/src/libs/utils/theme/theme.h
+++ b/src/libs/utils/theme/theme.h
@@ -151,6 +151,18 @@ public:
         IconsModeAnalyzeActiveColor,
         IconsModeHelpActiveColor,
 
+        /* Code model Icons */
+
+        IconsCodeModelKeywordColor,
+        IconsCodeModelClassColor,
+        IconsCodeModelStructColor,
+        IconsCodeModelFunctionColor,
+        IconsCodeModelVariableColor,
+        IconsCodeModelEnumColor,
+        IconsCodeModelMacroColor,
+        IconsCodeModelOverlayBackgroundColor,
+        IconsCodeModelOverlayForegroundColor,
+
         /* Output panes */
 
         OutputPanes_DebugTextColor,
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
index b1f72f79242..6a792c152c0 100644
--- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
+++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
@@ -275,6 +275,7 @@ GenericProposalWidgetPrivate::GenericProposalWidgetPrivate(QWidget *completionWi
     , m_assistant(0)
     , m_autoWidth(true)
 {
+    m_completionListView->setIconSize(QSize(16, 16));
     connect(m_completionListView, &QAbstractItemView::activated,
             this, &GenericProposalWidgetPrivate::handleActivation);
 
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 1435147586e..cb962e1c699 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -3405,6 +3405,587 @@
          id="path5457-0-5"
          style="display:inline" />
     </g>
+    <g
+       id="src/libs/cplusplus/images/member"
+       transform="translate(-28,0)">
+      <rect
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+         id="rect4853-8"
+         width="16"
+         height="16"
+         x="149"
+         y="552" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="codemodelrectangle"
+         d="m 158.5,554 4.5,4.5 -7.5,7.5 -4.5,-4.5"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/signal">
+      <rect
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+         id="rect4853-8-7"
+         width="16"
+         height="16"
+         x="137"
+         y="552" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#codemodelrectangle"
+         id="use4961"
+         transform="translate(-12,0)"
+         width="100%"
+         height="100%" />
+      <rect
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect4966"
+         width="8.5"
+         height="3.5"
+         x="494.26025"
+         y="287.81021"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+      <path
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.89999998;stroke-linecap:butt;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path5051"
+         sodipodi:type="arc"
+         sodipodi:cx="143.50003"
+         sodipodi:cy="561.49994"
+         sodipodi:rx="5"
+         sodipodi:ry="5"
+         sodipodi:start="4.7996554"
+         sodipodi:end="6.1959188"
+         d="m 143.93581,556.51897 a 5,5 0 0 1 4.54519,4.54519"
+         sodipodi:open="true" />
+      <path
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path5053"
+         sodipodi:type="arc"
+         sodipodi:cx="143.50003"
+         sodipodi:cy="561.49994"
+         sodipodi:rx="7"
+         sodipodi:ry="7"
+         sodipodi:start="4.7996554"
+         sodipodi:end="6.1959188"
+         d="m 144.11012,554.52658 a 7,7 0 0 1 6.36327,6.36327"
+         sodipodi:open="true" />
+      <path
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path5055"
+         sodipodi:type="arc"
+         sodipodi:cx="143.50003"
+         sodipodi:cy="561.49994"
+         sodipodi:rx="9"
+         sodipodi:ry="9"
+         sodipodi:start="4.7996554"
+         sodipodi:end="6.1959188"
+         d="m 144.28443,552.53419 a 9,9 0 0 1 8.18135,8.18135"
+         sodipodi:open="true" />
+    </g>
+    <g
+       transform="translate(4,0)"
+       id="src/libs/cplusplus/images/slot">
+      <rect
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+         id="rect4853-8-0"
+         width="16"
+         height="16"
+         x="149"
+         y="552" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#codemodelrectangle"
+         id="use4943" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 153,557.5 3,3 -1.5,1.5 -3,-3 z"
+         id="slot_gap"
+         inkscape:connector-curvature="0"
+         inkscape:label="#path4966"
+         sodipodi:nodetypes="ccccc" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#slot_gap"
+         id="use4968"
+         transform="translate(3,-3)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/protected"
+       transform="translate(36,0)">
+      <rect
+         y="552"
+         x="133"
+         height="16"
+         width="16"
+         id="rect4853"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <g
+         id="prototype_key"
+         inkscape:label="#g5172">
+        <circle
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+           id="path4844"
+           cx="139.5"
+           cy="564.5"
+           r="2" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 141.5,564.5 6,0 0,0"
+           id="path7855"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect7857"
+           width="3"
+           height="2"
+           x="144"
+           y="565" />
+      </g>
+    </g>
+    <g
+       id="src/libs/cplusplus/images/protectedbackground"
+       transform="translate(52,0)">
+      <rect
+         y="552"
+         x="133"
+         height="16"
+         width="16"
+         id="rect4853-7"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <g
+         id="prototype_key-68"
+         inkscape:label="#g5172">
+        <circle
+           style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:#000000;stroke-opacity:1;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none"
+           id="path4844-1"
+           cx="139.5"
+           cy="564.5"
+           r="2" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+           d="m 141.5,564.5 6,0 0,0"
+           id="path7855-0"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect7857-6"
+           width="2"
+           height="1"
+           x="144.5"
+           y="565.5" />
+      </g>
+    </g>
+    <g
+       id="src/libs/cplusplus/images/private"
+       transform="translate(36,0)">
+      <rect
+         y="552"
+         x="165"
+         height="16"
+         width="16"
+         id="rect4853-8-9"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <rect
+         y="562"
+         x="173"
+         height="5"
+         width="7"
+         id="rect4897"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <path
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4916"
+         sodipodi:type="arc"
+         sodipodi:cx="176.5"
+         sodipodi:cy="561.5"
+         sodipodi:rx="2"
+         sodipodi:ry="2"
+         sodipodi:start="3.1415927"
+         sodipodi:end="0"
+         d="m 174.5,561.5 a 2,2 0 0 1 2,-2 2,2 0 0 1 2,2"
+         sodipodi:open="true" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 174.5,561.5 c 0,0.5 0,0.5 0,0.5"
+         id="path4918"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 178.5,561.5 c 0,0.5 0,0.5 0,0.5"
+         id="path4920"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 176.5,563 c 1,0 1,1 1,1.5 0,0.5 0,1.5 -1,1.5 -1,0 -1,-1 -1,-1.5 0,-0.5 0,-1.5 1,-1.5 z"
+         id="path5026"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="zzzzz" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/privatebackground"
+       transform="translate(52,0)">
+      <rect
+         y="552"
+         x="165"
+         height="16"
+         width="16"
+         id="rect4853-8-9-7"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <rect
+         y="562"
+         x="173"
+         height="5"
+         width="7"
+         id="rect4897-3"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round" />
+      <path
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4916-8"
+         sodipodi:type="arc"
+         sodipodi:cx="176.5"
+         sodipodi:cy="561.5"
+         sodipodi:rx="2"
+         sodipodi:ry="2"
+         sodipodi:start="3.1415927"
+         sodipodi:end="0"
+         d="m 174.5,561.5 a 2,2 0 0 1 2,-2 2,2 0 0 1 2,2"
+         sodipodi:open="true" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 174.5,561.5 c 0,0.5 0,0.5 0,0.5"
+         id="path4918-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 178.5,561.5 c 0,0.5 0,0.5 0,0.5"
+         id="path4920-8"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/static"
+       transform="translate(68,0)">
+      <rect
+         y="552"
+         x="165"
+         height="16"
+         width="16"
+         id="rect4853-8-9-8"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 171,554.5 -2,0 c -0.5,0 -1.5,0 -1.5,1 0,1 1,1 1.5,1 0.5,0 1.5,0 1.5,1 0,1 -1,1 -1.5,1 l -2,0"
+         id="path5086"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cczczcc" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/staticbackground"
+       transform="translate(84,0)">
+      <rect
+         y="552"
+         x="165"
+         height="16"
+         width="16"
+         id="rect4853-8-9-8-3"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 172,554.5 -3,0 c -0.5,0 -1.5,0 -1.5,1 0,1 1,1 1.5,1 0.5,0 1.5,0 1.5,1 0,1 -1,1 -1.5,1 l -3,0"
+         id="path5086-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cczczcc" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/classparent"
+       transform="translate(84,0)">
+      <rect
+         y="552"
+         x="181"
+         height="16"
+         width="16"
+         id="rect4853-8-9-8-3-7-49"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 186.5,552 3,3 -5.5,5.5 -3,-3 z"
+         id="path4895-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/classmemberfunction"
+       transform="translate(100,0)">
+      <rect
+         y="552"
+         x="181"
+         height="16"
+         width="16"
+         id="rect4853-8-9-8-3-7-4"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 194.5,554.5 2.5,2.5 -4,4 -2.5,-2.5 z"
+         id="cppclassmember"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         inkscape:label="#path4895-4" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/classmembervariable"
+       transform="translate(116,0)">
+      <rect
+         y="552"
+         x="181"
+         height="16"
+         width="16"
+         id="rect4853-8-9-8-3-7"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#cppclassmember"
+         id="use4914-9-5"
+         transform="translate(0,7)"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/classrelation"
+       transform="translate(148,0)">
+      <rect
+         y="552"
+         x="165"
+         height="16"
+         width="16"
+         id="rect4853-8-9-8-3-7-5"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+         d="m 172.5,557.5 0,7 4.5,0"
+         id="path4919-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 169,557.5 9,0"
+         id="path4921-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/classrelationbackground"
+       transform="translate(164,0)">
+      <rect
+         y="552"
+         x="165"
+         height="16"
+         width="16"
+         id="rect4853-8-9-8-3-7-5-1"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 172.5,557.5 0,7 4.5,0"
+         id="path4919-8-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
+      <path
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 169,557.5 9,0"
+         id="path4921-7-4"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/keyword">
+      <rect
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+         id="rect4853-8-9-8-3-7-5-1-9"
+         width="16"
+         height="16"
+         x="345"
+         y="552" />
+      <circle
+         r="2.5"
+         cy="560.5"
+         cx="353.5"
+         id="path4897"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/namespace">
+      <rect
+         y="552"
+         x="361"
+         height="16"
+         width="16"
+         id="rect4853-8-9-8-3-7-5-1-9-9"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <rect
+         y="555"
+         x="365"
+         height="4"
+         width="3"
+         id="namespacedot"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         ry="1.5" />
+      <use
+         height="100%"
+         width="100%"
+         transform="translate(5,0)"
+         id="use4982"
+         xlink:href="#namespacedot"
+         y="0"
+         x="0" />
+      <use
+         height="100%"
+         width="100%"
+         transform="translate(0,6)"
+         id="use4984"
+         xlink:href="#namespacedot"
+         y="0"
+         x="0" />
+      <use
+         height="100%"
+         width="100%"
+         transform="translate(5,6)"
+         id="use4986"
+         xlink:href="#namespacedot"
+         y="0"
+         x="0" />
+    </g>
+    <g
+       id="src/libs/cplusplus/images/macro">
+      <rect
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
+         id="rect4853-8-9-8-3-7-5-1-9-9-5"
+         width="16"
+         height="16"
+         x="377"
+         y="552" />
+      <rect
+         y="556.5"
+         x="378.5"
+         height="7"
+         width="13"
+         id="rect5079"
+         style="opacity:1;fill:#000000;fill-opacity:1.0;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <g
+         id="g5126"
+         style="stroke:#ffffff;stroke-opacity:1;stroke-width:1.00000002;stroke-miterlimit:4;stroke-dasharray:none;fill:none;stroke-linecap:square">
+        <circle
+           id="path5050"
+           cx="381.5"
+           cy="560.5"
+           r="1"
+           style="fill:none;stroke-linecap:square;stroke:#ffffff" />
+        <path
+           d="m 382.5,559.5 0,2"
+           id="path5075"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           style="stroke-linecap:square;stroke:#ffffff" />
+        <circle
+           id="path5050-3"
+           cx="385.5"
+           cy="560.5"
+           r="1"
+           style="stroke-linecap:square;stroke:#ffffff" />
+        <path
+           d="M 384.53125,558.44141 384.5,561.5"
+           id="path5077"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           style="stroke-linecap:square;stroke:#ffffff" />
+        <path
+           id="path5050-6"
+           sodipodi:type="arc"
+           sodipodi:cx="389.5"
+           sodipodi:cy="560.5"
+           sodipodi:rx="1"
+           sodipodi:ry="1"
+           sodipodi:start="0.90757121"
+           sodipodi:end="5.427974"
+           d="m 390.11566,561.28801 a 1,1 0 0 1 -1.36269,-0.12321 1,1 0 0 1 0.0358,-1.36778 1,1 0 0 1 1.36727,-0.0517"
+           sodipodi:open="true"
+           style="stroke-linecap:butt;stroke:#ffffff" />
+      </g>
+    </g>
+    <g
+       id="src/libs/cplusplus/images/enum"
+       transform="translate(16,0)">
+      <rect
+         y="552"
+         x="377"
+         height="16"
+         width="16"
+         id="rect4853-8-9-8-3-7-5-1-9-9-5-0"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <use
+         height="100%"
+         width="100%"
+         transform="translate(4,-5)"
+         id="use5194"
+         xlink:href="#enum"
+         y="0"
+         x="0" />
+      <rect
+         style="opacity:0.45;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect5183-6"
+         width="11"
+         height="8"
+         x="378"
+         y="558" />
+      <g
+         id="enum"
+         transform="translate(1,1)">
+        <rect
+           style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect5183"
+           width="9"
+           height="6"
+           x="377.5"
+           y="558.5" />
+      </g>
+    </g>
+    <g
+       id="src/libs/cplusplus/images/enumerator"
+       transform="translate(32,0)">
+      <rect
+         y="552"
+         x="377"
+         height="16"
+         width="16"
+         id="rect4853-8-9-8-3-7-5-1-9-9-5-0-4"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <use
+         x="0"
+         y="0"
+         xlink:href="#enum"
+         id="use4927"
+         transform="translate(4,-5)"
+         width="100%"
+         height="100%" />
+      <rect
+         style="opacity:0.45;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect5183-6-1"
+         width="11"
+         height="8"
+         x="378"
+         y="558" />
+      <rect
+         y="559.5"
+         x="378.5"
+         height="6"
+         width="9"
+         id="rect5183-16"
+         style="opacity:1;fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"