diff --git a/SandboxiePlus/SandMan/Dialogs/MultiErrorDialog.cpp b/SandboxiePlus/SandMan/Dialogs/MultiErrorDialog.cpp
index a28f253c..a7375298 100644
--- a/SandboxiePlus/SandMan/Dialogs/MultiErrorDialog.cpp
+++ b/SandboxiePlus/SandMan/Dialogs/MultiErrorDialog.cpp
@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "../../MiscHelpers/Common/Settings.h"
 #include "MultiErrorDialog.h"
+#include "..\SandMan.h"
 
 
 CMultiErrorDialog::CMultiErrorDialog(const QString& Message, const QStringList& Errors, QWidget* parent)
@@ -13,6 +14,7 @@ CMultiErrorDialog::CMultiErrorDialog(const QString& Message, const QStringList&
 	m_pMainLayout->addWidget(new QLabel(Message), Row++, 0, 1, 4);
 
 	m_pErrors = new CPanelWidgetEx();
+	m_pErrors->GetTree()->setItemDelegate(new CTreeItemDelegate());
 	
 	m_pErrors->GetTree()->setHeaderLabels(tr("Message").split("|"));
 
diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp
index c8bc1cd0..204a4020 100644
--- a/SandboxiePlus/SandMan/SandMan.cpp
+++ b/SandboxiePlus/SandMan/SandMan.cpp
@@ -764,6 +764,7 @@ void CSandMan::CreateView(int iViewMode)
 
 		// Message Log
 		m_pMessageLog = new CPanelWidgetEx();
+		m_pMessageLog->GetTree()->setItemDelegate(new CTreeItemDelegate());
 
 		//m_pMessageLog->GetView()->setItemDelegate(theGUI->GetItemDelegate());
 		((QTreeWidgetEx*)m_pMessageLog->GetView())->setHeaderLabels(tr("Time|Message").split("|"));
@@ -786,6 +787,7 @@ void CSandMan::CreateView(int iViewMode)
 
 		// Recovery Log
 		m_pRecoveryLog = new CPanelWidgetEx();
+		m_pRecoveryLog->GetTree()->setItemDelegate(new CTreeItemDelegate());
 
 		m_pRecoveryLog->GetTree()->setAlternatingRowColors(theConf->GetBool("Options/AltRowColors", false));
 
diff --git a/SandboxiePlus/SandMan/SandManRecovery.cpp b/SandboxiePlus/SandMan/SandManRecovery.cpp
index f746d6c4..957c439a 100644
--- a/SandboxiePlus/SandMan/SandManRecovery.cpp
+++ b/SandboxiePlus/SandMan/SandManRecovery.cpp
@@ -45,7 +45,7 @@ bool CSandMan::OpenRecovery(const CSandBoxPtr& pBox, bool& DeleteShapshots, bool
 CRecoveryWindow* CSandMan::ShowRecovery(const CSandBoxPtr& pBox, bool bFind)
 {
 	auto pBoxEx = pBox.objectCast<CSandBoxPlus>();
-	if (!pBoxEx) return false;
+	if (!pBoxEx) return NULL;
 	if (pBoxEx->m_pRecoveryWnd == NULL) {
 		pBoxEx->m_pRecoveryWnd = new CRecoveryWindow(pBox, bFind == false);
 		connect(pBoxEx->m_pRecoveryWnd, &CRecoveryWindow::Closed, [pBoxEx]() {
@@ -191,6 +191,7 @@ CRecoveryLogWnd::CRecoveryLogWnd(QWidget *parent)
 	//pLayout->setMargin(3);
 	
 	m_pRecoveryLog = new CPanelWidgetEx();
+	m_pRecoveryLog->GetTree()->setItemDelegate(new CTreeItemDelegate());
 
 	m_pRecoveryLog->GetTree()->setAlternatingRowColors(theConf->GetBool("Options/AltRowColors", false));
 
diff --git a/SandboxiePlus/SandMan/Windows/RecoveryWindow.cpp b/SandboxiePlus/SandMan/Windows/RecoveryWindow.cpp
index 13cf33d1..04c9605a 100644
--- a/SandboxiePlus/SandMan/Windows/RecoveryWindow.cpp
+++ b/SandboxiePlus/SandMan/Windows/RecoveryWindow.cpp
@@ -55,10 +55,9 @@ CRecoveryWindow::CRecoveryWindow(const CSandBoxPtr& pBox, bool bImmediate, QWidg
 	m_bReloadPending = false;
 	m_DeleteShapshots = false;
 
-#ifdef WIN32
 	QStyle* pStyle = QStyleFactory::create("windows");
 	ui.treeFiles->setStyle(pStyle);
-#endif
+	ui.treeFiles->setItemDelegate(new CTreeItemDelegate());
 	ui.treeFiles->setExpandsOnDoubleClick(false);
 
 	ui.btnDeleteAll->setVisible(false);
diff --git a/SandboxiePlus/SandMan/Windows/SnapshotsWindow.cpp b/SandboxiePlus/SandMan/Windows/SnapshotsWindow.cpp
index edcb8618..fe68cbc8 100644
--- a/SandboxiePlus/SandMan/Windows/SnapshotsWindow.cpp
+++ b/SandboxiePlus/SandMan/Windows/SnapshotsWindow.cpp
@@ -29,10 +29,9 @@ CSnapshotsWindow::CSnapshotsWindow(const CSandBoxPtr& pBox, QWidget *parent)
 	m_pBox = pBox;
 	m_SaveInfoPending = 0;
 
-#ifdef WIN32
 	QStyle* pStyle = QStyleFactory::create("windows");
 	ui.treeSnapshots->setStyle(pStyle);
-#endif
+	ui.treeSnapshots->setItemDelegate(new CTreeItemDelegate());
 	ui.treeSnapshots->setExpandsOnDoubleClick(false);
 
 	m_pSnapshotModel = new CSimpleTreeModel();