diff --git a/bin/app/data/gui/window/source_group_add.png b/bin/app/data/gui/window/source_group_add.png
new file mode 100644
index 00000000..e77b0343
Binary files /dev/null and b/bin/app/data/gui/window/source_group_add.png differ
diff --git a/bin/app/data/gui/window/source_group_add_hover.png b/bin/app/data/gui/window/source_group_add_hover.png
new file mode 100644
index 00000000..3fe56ba8
Binary files /dev/null and b/bin/app/data/gui/window/source_group_add_hover.png differ
diff --git a/bin/app/data/gui/window/source_group_copy.png b/bin/app/data/gui/window/source_group_copy.png
new file mode 100644
index 00000000..20e719ae
Binary files /dev/null and b/bin/app/data/gui/window/source_group_copy.png differ
diff --git a/bin/app/data/gui/window/source_group_copy_hover.png b/bin/app/data/gui/window/source_group_copy_hover.png
new file mode 100644
index 00000000..35437131
Binary files /dev/null and b/bin/app/data/gui/window/source_group_copy_hover.png differ
diff --git a/bin/app/data/gui/window/source_group_delete.png b/bin/app/data/gui/window/source_group_delete.png
new file mode 100644
index 00000000..4cdbe8bb
Binary files /dev/null and b/bin/app/data/gui/window/source_group_delete.png differ
diff --git a/bin/app/data/gui/window/source_group_delete_hover.png b/bin/app/data/gui/window/source_group_delete_hover.png
new file mode 100644
index 00000000..0a4df2e2
Binary files /dev/null and b/bin/app/data/gui/window/source_group_delete_hover.png differ
diff --git a/bin/app/data/gui/window/window.css b/bin/app/data/gui/window/window.css
index 2e724f4c..90ccc612 100644
--- a/bin/app/data/gui/window/window.css
+++ b/bin/app/data/gui/window/window.css
@@ -221,10 +221,15 @@ QCheckBox:disabled {
 	color: black;
 }
 
+#project_menu QListWidget::item:disabled, #project_menu #general_button:disabled {
+	background: white;
+	color: gray;
+}
+
 #project_menu #action_button {
 	background: white;
 	border: none;
 	color: white;
-	margin: 5px;
+	margin: 5px 5px 3px;
 	padding: 1px;
 }
diff --git a/src/lib_gui/qt/element/QtIconButton.cpp b/src/lib_gui/qt/element/QtIconButton.cpp
index a24b098a..9038a3b7 100644
--- a/src/lib_gui/qt/element/QtIconButton.cpp
+++ b/src/lib_gui/qt/element/QtIconButton.cpp
@@ -25,7 +25,7 @@ void QtIconButton::setColor(QColor color)
 
 void QtIconButton::enterEvent(QEvent *event)
 {
-	if (m_hoveredIconPath.size())
+	if (m_hoveredIconPath.size() && isEnabled())
 	{
 		setIconFromPath(m_hoveredIconPath);
 	}
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
index 6e2a1557..8a9c4949 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
@@ -152,16 +152,16 @@ void QtProjectWizzard::populateWindow(QWidget* widget)
 		buttonsLayout->setSpacing(0);
 
 		QPushButton* addButton = new QtIconButton(
-			(ResourcePaths::getGuiPath().str() + "window/plus.png").c_str(),
-			(ResourcePaths::getGuiPath().str() + "window/plus_hover.png").c_str());
+			(ResourcePaths::getGuiPath().str() + "window/source_group_add.png").c_str(),
+			(ResourcePaths::getGuiPath().str() + "window/source_group_add_hover.png").c_str());
 
 		m_removeButton = new QtIconButton(
-			(ResourcePaths::getGuiPath().str() + "window/minus.png").c_str(),
-			(ResourcePaths::getGuiPath().str() + "window/minus_hover.png").c_str());
+			(ResourcePaths::getGuiPath().str() + "window/source_group_delete.png").c_str(),
+			(ResourcePaths::getGuiPath().str() + "window/source_group_delete_hover.png").c_str());
 
 		m_duplicateButton = new QtIconButton(
-			(ResourcePaths::getGuiPath().str() + "window/minus.png").c_str(),
-			(ResourcePaths::getGuiPath().str() + "window/minus_hover.png").c_str());
+			(ResourcePaths::getGuiPath().str() + "window/source_group_copy.png").c_str(),
+			(ResourcePaths::getGuiPath().str() + "window/source_group_copy_hover.png").c_str());
 
 		addButton->setIconSize(QSize(20, 20));
 		m_removeButton->setIconSize(QSize(20, 20));
@@ -182,11 +182,8 @@ void QtProjectWizzard::populateWindow(QWidget* widget)
 		connect(m_removeButton, SIGNAL(clicked()), this, SLOT(removeSelectedSourceGroup()));
 		connect(m_duplicateButton, SIGNAL(clicked()), this, SLOT(duplicateSelectedSourceGroup()));
 
-		buttonsLayout->addStretch();
 		buttonsLayout->addWidget(addButton);
-		buttonsLayout->addStretch();
 		buttonsLayout->addWidget(m_removeButton);
-		buttonsLayout->addStretch();
 		buttonsLayout->addWidget(m_duplicateButton);
 		buttonsLayout->addStretch();
 
@@ -523,7 +520,7 @@ void QtProjectWizzard::removeSelectedSourceGroup()
 
 void QtProjectWizzard::duplicateSelectedSourceGroup()
 {
-	if (!m_allSourceGroupSettings.size() || m_sourceGroupList->currentRow() < 0)
+	if (!m_allSourceGroupSettings.size() || m_sourceGroupList->currentRow() < 0 || !canExitContent())
 	{
 		return;
 	}
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp
index 5ca74122..35a40c34 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContent.cpp
@@ -134,7 +134,6 @@ void QtProjectWizzardContent::filesButtonClicked()
 	std::thread([&](){
 		std::vector<std::string> fileNames = getFileNames();
 		m_showFilesFunctor(fileNames);
-
 	}).detach();
 }
 
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp
index 981c3a3e..e31c4fc9 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp
@@ -79,6 +79,8 @@ void QtProjectWizzardContentCDBSource::load()
 
 std::vector<std::string> QtProjectWizzardContentCDBSource::getFileNames() const
 {
+	const_cast<QtProjectWizzardContentCDBSource*>(this)->load();
+
 	return m_fileNames;
 }