Index: src/ch/CustomCopyDlg.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -100,6 +100,10 @@
 {
 	CLanguageDialog::OnInitDialog();
 
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	AddResizableControl(IDC_001_STATIC, 0.0, 0.0, 1.0, 0.0);
 	AddResizableControl(IDC_FILES_LIST, 0.0, 0.0, 1.0, 0.5);
 	AddResizableControl(IDC_ADDFILE_BUTTON, 1.0, 0.0, 0.0, 0.0);
Index: src/ch/FeedbackFileErrorDlg.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/FeedbackFileErrorDlg.cpp	(.../FeedbackFileErrorDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/FeedbackFileErrorDlg.cpp	(.../FeedbackFileErrorDlg.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -47,6 +47,10 @@
 {
 	CLanguageDialog::OnInitDialog();
 
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	AddResizableControl(IDC_001_STATIC, 0.0, 0.0, 0.0, 0.0);
 	AddResizableControl(IDC_DESC_STATIC, 0.0, 0.0, 1.0, 0.0);
 	AddResizableControl(IDC_INFO_STATIC, 0.0, 0.0, 1.0, 1.0);
Index: src/ch/FeedbackNotEnoughSpaceDlg.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/FeedbackNotEnoughSpaceDlg.cpp	(.../FeedbackNotEnoughSpaceDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/FeedbackNotEnoughSpaceDlg.cpp	(.../FeedbackNotEnoughSpaceDlg.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -90,6 +90,10 @@
 {
 	CLanguageDialog::OnInitDialog();
 
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	AddResizableControl(IDC_HEADER_STATIC, 0.0, 0.0, 1.0, 0.0);
 	AddResizableControl(IDC_001_STATIC, 0.0, 0.0, 0.0, 0.0);
 
Index: src/ch/FeedbackReplaceDlg.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/FeedbackReplaceDlg.cpp	(.../FeedbackReplaceDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/FeedbackReplaceDlg.cpp	(.../FeedbackReplaceDlg.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -61,6 +61,10 @@
 {
 	CLanguageDialog::OnInitDialog();
 
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	AddResizableControl(IDC_INFO_STATIC, 0.0, 0.0, 1.0, 0.0);
 
 	AddResizableControl(IDC_00_STATIC, 0.0, 0.0, 1.0, 0.0);
Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -389,6 +389,10 @@
 	if (CreateControls() == -1)
 		EndDialog(-1);
 
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	// size of a dialog
 	CRect rcDialog;
 	GetClientRect(&rcDialog);
Index: src/ch/OptionsDlg.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/OptionsDlg.cpp	(.../OptionsDlg.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -88,6 +88,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);
Index: src/ch/ShutdownDlg.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/ShutdownDlg.cpp	(.../ShutdownDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/ShutdownDlg.cpp	(.../ShutdownDlg.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -56,7 +56,11 @@
 BOOL CShutdownDlg::OnInitDialog() 
 {
 	CLanguageDialog::OnInitDialog();
-	
+
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	// make on top
 	SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/);
 
Index: src/ch/StatusDlg.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/StatusDlg.cpp	(.../StatusDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/StatusDlg.cpp	(.../StatusDlg.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -97,6 +97,10 @@
 
 	PrepareResizableControls();
 
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	// get size of list ctrl
 	CRect rcList;
 	m_ctlStatusList.GetWindowRect(&rcList);
Index: src/ch/UpdaterDlg.cpp
===================================================================
diff -u -N -r8068e0c351055554340ac9755d1bc846893bf2b8 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/UpdaterDlg.cpp	(.../UpdaterDlg.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
+++ src/ch/UpdaterDlg.cpp	(.../UpdaterDlg.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -56,6 +56,10 @@
 {
 	ictranslate::CLanguageDialog::OnInitDialog();
 
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	InitRichEdit();
 	InitUpdateFreqCombo();
 	InitUpdateChannelCombo();
Index: src/ch/ch.rc
===================================================================
diff -u -N -rd18db617f4727a237c94b59af9b4328f829eda16 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/ch.rc	(.../ch.rc)	(revision d18db617f4727a237c94b59af9b4328f829eda16)
+++ src/ch/ch.rc	(.../ch.rc)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -31,15 +31,15 @@
 //
 
 IDD_MSGBOX_DIALOG DIALOGEX 0, 0, 177, 70
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_THICKFRAME
 CAPTION "Copy Handler"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    PUSHBUTTON      "Btn2",IDC_SECOND_BUTTON,63,49,50,14
-    PUSHBUTTON      "Btn3",IDC_THIRD_BUTTON,119,49,50,14
+    PUSHBUTTON      "",IDC_SECOND_BUTTON,63,49,50,14
+    PUSHBUTTON      "",IDC_THIRD_BUTTON,119,49,50,14
     ICON            "",IDC_IMAGE_STATIC,13,13,21,20,SS_REALSIZEIMAGE
     CONTROL         "Do not show this again",IDC_BASIC_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,36,163,10
-    PUSHBUTTON      "Btn1",IDC_FIRST_BUTTON,7,49,50,14
+    PUSHBUTTON      "",IDC_FIRST_BUTTON,7,49,50,14
     CONTROL         "",IDC_MSG_RICHEDIT,"RichEdit20W",WS_DISABLED | WS_TABSTOP | 0x804,43,13,127,20
     CONTROL         "",IDC_MEASURE_RICHEDIT,"RichEdit20W",NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP | 0x8c4,7,7,11,7
 END
@@ -306,7 +306,7 @@
 END
 
 IDD_SHORTCUTEDIT_DIALOG DIALOGEX 0, 0, 325, 206
-STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
 CAPTION "Shortcuts editing"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
@@ -329,7 +329,7 @@
 END
 
 IDD_RECENTEDIT_DIALOG DIALOGEX 0, 0, 325, 190
-STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+STYLE DS_SETFONT | DS_CONTEXTHELP | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
 CAPTION "Recent paths"
 FONT 8, "Tahoma", 0, 0, 0x1
 BEGIN
Index: src/ch/langs/polish.lng
===================================================================
diff -u -N -rd18db617f4727a237c94b59af9b4328f829eda16 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
Binary files differ