diff --git a/bin/app/data/gui/icon/cbp_icon.png b/bin/app/data/gui/icon/cbp_icon.png
new file mode 100644
index 00000000..538af178
Binary files /dev/null and b/bin/app/data/gui/icon/cbp_icon.png differ
diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index 40159821..f2c0489a 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -576,6 +576,9 @@
 						<Component Id='C_icon_Png' Guid='*' Win64="$(var.Win64)">
 							<File Id='C_icon' Name='c_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/c_icon.png' KeyPath='yes' />
 						</Component>
+						<Component Id='Cbp_icon_Png' Guid='*' Win64="$(var.Win64)">
+							<File Id='Cbp_icon' Name='cbp_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/cbp_icon.png' KeyPath='yes' />
+						</Component>
 						<Component Id='Cdb_icon_Png' Guid='*' Win64="$(var.Win64)">
 							<File Id='Cdb_icon' Name='cdb_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/cdb_icon.png' KeyPath='yes' />
 						</Component>
diff --git a/deployment/windows/wixSetup/sourcetrail.wxs b/deployment/windows/wixSetup/sourcetrail.wxs
index efa7b7a5..e9aec391 100644
--- a/deployment/windows/wixSetup/sourcetrail.wxs
+++ b/deployment/windows/wixSetup/sourcetrail.wxs
@@ -328,6 +328,7 @@
 				<ComponentRef Id='HistoryListArrowPng'/>
 
 				<ComponentRef Id='C_icon_Png'/>
+				<ComponentRef Id='Cbp_icon_Png'/>
 				<ComponentRef Id='Cdb_icon_Png'/>
 				<ComponentRef Id='SourcetrailIco'/>
 				<ComponentRef Id='Cpp_icon_Png'/>
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp
index 232d55a3..e86b1982 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp
@@ -49,7 +49,7 @@ void QtProjectWizzardContentSelect::populate(QGridLayout* layout, int& row)
 	m_sourceGroupTypeIconName[SOURCE_GROUP_CXX_CDB] = L"cdb_icon";
 	m_sourceGroupTypeIconName[SOURCE_GROUP_CXX_VS] = L"vs_icon";
 	m_sourceGroupTypeIconName[SOURCE_GROUP_CXX_SONARGRAPH] = L"sonargraph_icon";
-	m_sourceGroupTypeIconName[SOURCE_GROUP_CXX_CODEBLOCKS] = L"empty_icon"; // TODO: change this
+	m_sourceGroupTypeIconName[SOURCE_GROUP_CXX_CODEBLOCKS] = L"cbp_icon"; // TODO: change this
 	m_sourceGroupTypeIconName[SOURCE_GROUP_JAVA_EMPTY] = L"empty_icon";
 	m_sourceGroupTypeIconName[SOURCE_GROUP_JAVA_MAVEN] = L"mvn_icon";
 	m_sourceGroupTypeIconName[SOURCE_GROUP_JAVA_GRADLE] = L"gradle_icon";
@@ -58,14 +58,19 @@ void QtProjectWizzardContentSelect::populate(QGridLayout* layout, int& row)
 	// define descriptions for each kind of Source Group
 	m_sourceGroupTypeDescriptions[SOURCE_GROUP_C_EMPTY] = "Create a new Sourcetrail Source Group by defining which C files will be indexed.";
 	m_sourceGroupTypeDescriptions[SOURCE_GROUP_CPP_EMPTY] = "Create a new Sourcetrail Source Group by defining which C++ files will be indexed.";
-	m_sourceGroupTypeDescriptions[SOURCE_GROUP_CXX_CDB] = "Create a Source Group from an existing Compilation Database (compile_commands.json). "
-		"They can be exported from CMake<br />(-D CMAKE_EXPORT_COMPILE_COMMANDS=1) and Make projects. Have a look at the <a href=\"https://sourcetrail.com/documentation/#CreateAProjectFromCompilationDatabase\">"
+	m_sourceGroupTypeDescriptions[SOURCE_GROUP_CXX_CDB] = 
+		"Create a Source Group from an existing Compilation Database (compile_commands.json). "
+		"They can be exported from CMake<br />(-D CMAKE_EXPORT_COMPILE_COMMANDS=1) and Make projects. Have a look at the "
+		"<a href=\"https://sourcetrail.com/documentation/#CreateAProjectFromCompilationDatabase\">"
 		"documentation</a>.";
-	m_sourceGroupTypeDescriptions[SOURCE_GROUP_CXX_VS] = "Create a new Source Group from an existing Visual Studio Solution file. "
-		"<b>Note: Requires a running Visual Studio instance with the "
-		"<a href=\"https://sourcetrail.com/documentation/index.html#VisualStudio\">Visual Studio plugin</a> installed.";
+	m_sourceGroupTypeDescriptions[SOURCE_GROUP_CXX_VS] = 
+		"<p>Create a new Source Group from an existing Visual Studio Solution file.</p>"
+		"<p><b>Note</b>: Requires a running Visual Studio instance with the "
+		"<a href=\"https://sourcetrail.com/documentation/index.html#VisualStudio\">Sourcetrail Visual Studio Extension</a> installed.</p>";
 	m_sourceGroupTypeDescriptions[SOURCE_GROUP_CXX_SONARGRAPH] = "Create a new Source Group from an existing Sonargraph project file.";
-	m_sourceGroupTypeDescriptions[SOURCE_GROUP_CXX_CODEBLOCKS] = "Create a new Source Group from an existing Code::Blocks project file.";
+	m_sourceGroupTypeDescriptions[SOURCE_GROUP_CXX_CODEBLOCKS] = 
+		"<p>Create a new Source Group from an existing Code::Blocks project file.</p>"
+		"<p><b>Note</b>: A \".cbp\" file will also be generated by the <b>Qt Creator</b> if a CMakeLists file is imported.</p>";
 	m_sourceGroupTypeDescriptions[SOURCE_GROUP_JAVA_EMPTY] = "Create a new Sourcetrail Source Group by defining which Java files will be indexed.";
 	m_sourceGroupTypeDescriptions[SOURCE_GROUP_JAVA_MAVEN] = "Create a new Source Group from an existing Maven project.";
 	m_sourceGroupTypeDescriptions[SOURCE_GROUP_JAVA_GRADLE] = "Create a new Source Group from an existing Gradle project.";