Index: src/ch/OptionsDlg.cpp
===================================================================
diff -u -r8068e0c351055554340ac9755d1bc846893bf2b8 -rbaad6054459abaaf69cbfd1ebad8783085160d99
--- src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision baad6054459abaaf69cbfd1ebad8783085160d99)
@@ -39,7 +39,8 @@
 // COptionsDlg dialog
 
 COptionsDlg::COptionsDlg(CWnd* pParent /*=nullptr*/)
-	:ictranslate::CLanguageDialog(IDD_OPTIONS_DIALOG, pParent, &m_bLock)
+	:ictranslate::CLanguageDialog(IDD_OPTIONS_DIALOG, pParent, &m_bLock),
+	m_spLog(logger::MakeLogger(GetLogFileData(), L"OptionsDlg"))
 {
 }
 
@@ -88,6 +89,10 @@
 {
 	CLanguageDialog::OnInitDialog();
 
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	AddResizableControl(IDC_PROPERTIES_LIST, 0.0, 0.0, 1.0, 1.0);
 	AddResizableControl(IDOK, 1.0, 1.0, 0.0, 0.0);
 	AddResizableControl(IDCANCEL, 1.0, 1.0, 0.0, 0.0);
@@ -128,7 +133,7 @@
 	COptionsDlg* pDlg=static_cast<COptionsDlg*>(lpParam);
 
 	chcore::TBufferSizes tBufferSizes(pDlg->GetBoolProp(iIndex - iParam - 1),
-		pDlg->GetUintProp(iIndex - iParam + 5),
+		pDlg->GetUintProp(iIndex - iParam + 7),
 		pDlg->GetUintProp(iIndex - iParam),
 		pDlg->GetUintProp(iIndex - iParam + 1),
 		pDlg->GetUintProp(iIndex - iParam + 2),
@@ -155,7 +160,7 @@
 		pItem->csProperties.SetAt(0, _itot(tBufferSizes.GetCDSize(), xx, 10));
 		pItem = (PROPERTYITEM*) pList->GetAt(pList->FindIndex(iIndex - iParam + 4));
 		pItem->csProperties.SetAt(0, _itot(tBufferSizes.GetLANSize(), xx, 10));
-		pItem = (PROPERTYITEM*) pList->GetAt(pList->FindIndex(iIndex - iParam + 5));
+		pItem = (PROPERTYITEM*) pList->GetAt(pList->FindIndex(iIndex - iParam + 7));
 		pItem->csProperties.SetAt(0, _itot(tBufferSizes.GetBufferCount(), xx, 10));
 	}
 }
@@ -207,6 +212,7 @@
 	ApplyProperties();
 
 	SendClosingNotify();
+
 	CLanguageDialog::OnOK();
 }
 
@@ -286,7 +292,6 @@
 
 	PROP_SEPARATOR(IDS_PROCESSINGTHREAD_STRING);
 	PROP_BOOL(IDS_SETDESTATTRIB_STRING, GetPropValue<PP_CMSETDESTATTRIBUTES>(GetConfig()));
-	PROP_BOOL(IDS_SETDESTTIME_STRING, GetPropValue<PP_CMSETDESTDATE>(GetConfig()));
 	PROP_BOOL(IDS_PROTECTROFILES_STRING, GetPropValue<PP_CMPROTECTROFILES>(GetConfig()));
 
 	PROP_BOOL(IDS_USECUSTOMNAMING, GetPropValue<PP_USECUSTOMNAMING>(GetConfig()));
@@ -313,9 +318,17 @@
 	PROP_UINT(IDS_BUFFER_QUEUE_DEPTH, GetPropValue<PP_BFQUEUEDEPTH>(GetConfig()));
 
 	PROP_SEPARATOR(IDS_CFGLOGFILE_STRING);
-	PROP_BOOL(IDS_CFGENABLELOGGING_STRING, GetPropValue<PP_LOGENABLELOGGING>(GetConfig()));
 	PROP_UINT(IDS_CFGMAXLIMIT_STRING, GetPropValue<PP_LOGMAXSIZE>(GetConfig()));
-	PROP_COMBO(IDS_CFGLOGLEVEL, IDS_CFGLOGLEVEL_VALUES, GetPropValue<PP_LOGLEVEL>(GetConfig()));
+	PROP_UINT(IDS_CFGROTATEDCOUNT_STRING, GetPropValue<PP_LOGROTATECOUNT>(GetConfig()));
+	PROP_COMBO(IDS_CFGLOGLEVEL_APP, IDS_CFGLOGLEVEL_VALUES, GetPropValue<PP_LOGLEVEL_APP>(GetConfig()));
+	PROP_COMBO(IDS_CFGLOGLEVEL_ENGINEDEFAULT, IDS_CFGLOGLEVEL_VALUES, GetPropValue<PP_LOGLEVEL_ENGINEDEFAULT>(GetConfig()));
+	PROP_COMBO(IDS_CFGLOGLEVEL_SERIALIZER, IDS_CFGLOGLEVEL_VALUES, GetPropValue<PP_LOGLEVEL_SERIALIZER>(GetConfig()));
+	PROP_COMBO(IDS_CFGLOGLEVEL_TASK, IDS_CFGLOGLEVEL_VALUES, GetPropValue<PP_LOGLEVEL_TASK>(GetConfig()));
+	PROP_COMBO(IDS_CFGLOGLEVEL_SUBTASK_SCANDIR, IDS_CFGLOGLEVEL_VALUES, GetPropValue<PP_LOGLEVEL_SUBTASK_SCANDIR>(GetConfig()));
+	PROP_COMBO(IDS_CFGLOGLEVEL_SUBTASK_COPYMOVE, IDS_CFGLOGLEVEL_VALUES, GetPropValue<PP_LOGLEVEL_SUBTASK_COPYMOVE>(GetConfig()));
+	PROP_COMBO(IDS_CFGLOGLEVEL_SUBTASK_FASTMOVE, IDS_CFGLOGLEVEL_VALUES, GetPropValue<PP_LOGLEVEL_SUBTASK_FASTMOVE>(GetConfig()));
+	PROP_COMBO(IDS_CFGLOGLEVEL_SUBTASK_DELETE, IDS_CFGLOGLEVEL_VALUES, GetPropValue<PP_LOGLEVEL_SUBTASK_DELETE>(GetConfig()));
+	PROP_COMBO(IDS_CFGLOGLEVEL_FILESYSTEM, IDS_CFGLOGLEVEL_VALUES, GetPropValue<PP_LOGLEVEL_FILESYSTEM>(GetConfig()));
 
 	// Sounds
 	PROP_SEPARATOR(IDS_SOUNDS_STRING);
@@ -406,7 +419,6 @@
 
 	SKIP_SEPARATOR(iPosition);
 	SetPropValue<PP_CMSETDESTATTRIBUTES>(rConfig, GetBoolProp(iPosition++));
-	SetPropValue<PP_CMSETDESTDATE>(rConfig, GetBoolProp(iPosition++));
 	SetPropValue<PP_CMPROTECTROFILES>(rConfig, GetBoolProp(iPosition++));
 	SetPropValue<PP_USECUSTOMNAMING>(rConfig, GetBoolProp(iPosition++));
 	SetPropValue<PP_CUSTOMNAME_FIRST>(rConfig, GetStringProp(iPosition++));
@@ -433,9 +445,17 @@
 
 	// log file
 	SKIP_SEPARATOR(iPosition);
-	SetPropValue<PP_LOGENABLELOGGING>(rConfig, GetBoolProp(iPosition++));
 	SetPropValue<PP_LOGMAXSIZE>(rConfig, GetUintProp(iPosition++));
-	SetPropValue<PP_LOGLEVEL>(rConfig, GetIndexProp(iPosition++));
+	SetPropValue<PP_LOGROTATECOUNT>(rConfig, GetUintProp(iPosition++));
+	SetPropValue<PP_LOGLEVEL_APP>(rConfig, GetIndexProp(iPosition++));
+	SetPropValue<PP_LOGLEVEL_ENGINEDEFAULT>(rConfig, GetIndexProp(iPosition++));
+	SetPropValue<PP_LOGLEVEL_SERIALIZER>(rConfig, GetIndexProp(iPosition++));
+	SetPropValue<PP_LOGLEVEL_TASK>(rConfig, GetIndexProp(iPosition++));
+	SetPropValue<PP_LOGLEVEL_SUBTASK_SCANDIR>(rConfig, GetIndexProp(iPosition++));
+	SetPropValue<PP_LOGLEVEL_SUBTASK_COPYMOVE>(rConfig, GetIndexProp(iPosition++));
+	SetPropValue<PP_LOGLEVEL_SUBTASK_FASTMOVE>(rConfig, GetIndexProp(iPosition++));
+	SetPropValue<PP_LOGLEVEL_SUBTASK_DELETE>(rConfig, GetIndexProp(iPosition++));
+	SetPropValue<PP_LOGLEVEL_FILESYSTEM>(rConfig, GetIndexProp(iPosition++));
 
 	// Sounds
 	SKIP_SEPARATOR(iPosition);
@@ -453,6 +473,18 @@
 	rConfig.ResumeNotifications();
 
 	rConfig.Write();
+
+	LOG_INFO(m_spLog) << L"Updating shell extension configuration";
+	try
+	{
+		TShellExtensionConfigPtr spConfig = GetShellExtensionConfig();
+		if(spConfig)
+			spConfig->PrepareConfig();
+	}
+	catch(const std::exception& e)
+	{
+		LOG_INFO(m_spLog) << L"Failed to set shell extension configuration. Error: " << e.what();
+	}
 }
 
 void COptionsDlg::OnCancel()