5 files changed, 11 insertions, 17 deletions
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp
index 558426105a..cd5fc11f54 100644
--- a/plugins/AVS/src/options.cpp
+++ b/plugins/AVS/src/options.cpp
@@ -1102,7 +1102,6 @@ static INT_PTR CALLBACK DlgProcAvatarProtoInfo(HWND hwndDlg, UINT msg, WPARAM wP
 int OnDetailsInit(WPARAM wParam, LPARAM lParam)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.hIcon = g_hIcon;
 	odp.hInstance = g_hInst;
 	odp.szTitle.a = LPGEN("Avatar");
 
diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp
index 0b4adb1ce7..a33c542419 100644
--- a/plugins/Quotes/src/Forex.cpp
+++ b/plugins/Quotes/src/Forex.cpp
@@ -270,7 +270,6 @@ int QuotesEventFunc_OptInitialise(WPARAM wp, LPARAM/* lp*/)
 	odp.hInstance = g_hInstance;
 	odp.szTitle.w = _T(QUOTES_PROTOCOL_NAME);
 	odp.szGroup.w = LPGENW("Network");
-	odp.hIcon = Quotes_LoadIconEx(IDI_ICON_MAIN);
 	odp.flags = ODPF_USERINFOTAB | ODPF_UNICODE;
 
 	std::for_each(rapProviders.begin(), rapProviders.end(), boost::bind(&IQuotesProvider::ShowPropertyPage, _1, wp, boost::ref(odp)));
diff --git a/plugins/Quotes/src/QuoteInfoDlg.cpp b/plugins/Quotes/src/QuoteInfoDlg.cpp
index 5e3d355590..14e2cd8ae7 100644
--- a/plugins/Quotes/src/QuoteInfoDlg.cpp
+++ b/plugins/Quotes/src/QuoteInfoDlg.cpp
@@ -109,7 +109,6 @@ int QuotesEventFunc_OnUserInfoInit(WPARAM wp, LPARAM lp)
 
 	OPTIONSDIALOGPAGE odp = { 0 };
 	odp.hInstance = g_hInstance;
-	odp.hIcon = Quotes_LoadIconEx(IDI_ICON_MAIN);
 	odp.pfnDlgProc = QuoteInfoDlgProc;
 	odp.position = -2000000000;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_QUOTE_INFO);
diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp
index 99e3f70f29..b006a05789 100644
--- a/plugins/UserInfoEx/src/classPsTreeItem.cpp
+++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp
@@ -332,7 +332,7 @@ int CPsTreeItem::Icon(HIMAGELIST hIml, OPTIONSDIALOGPAGE *odp, BYTE bInitIconsOn
 
 				// icon library exists?
 				if (sid.defaultFile.w)
-					sid.iDefaultIndex = (INT_PTR)odp->hIcon;
+					sid.iDefaultIndex = odp->dwInitParam;
 				// no valid icon library
 				else {
 					bNeedFree = true;
@@ -342,10 +342,7 @@ int CPsTreeItem::Icon(HIMAGELIST hIml, OPTIONSDIALOGPAGE *odp, BYTE bInitIconsOn
 			}
 			// default icon is delivered by the page to add
 			else {
-				if (odp->hIcon)
-					sid.hDefaultIcon = odp->hIcon;
-				else
-					sid.hDefaultIcon = ImageList_GetIcon(hIml, 0, ILD_NORMAL), bNeedFree = true;
+				sid.hDefaultIcon = ImageList_GetIcon(hIml, 0, ILD_NORMAL), bNeedFree = true;
 				sid.iDefaultIndex = -1;
 			}
 		}
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 83f6400fb3..6e300df305 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -436,56 +436,56 @@ static int AddProtocolPages(OPTIONSDIALOGPAGE& odp, WPARAM wParam, LPSTR pszProt
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_GENERAL);
 	odp.position = 0x8000000;
 	odp.pfnDlgProc = PSPProcGeneral;
-	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_GENERAL);
+	odp.dwInitParam = ICONINDEX(IDI_TREE_GENERAL);
 	mir_wstrncpy(szTitle + ofs, LPGENW("General"), _countof(szTitle) - ofs);
 	AddPage(wParam, (LPARAM)&odp);
 
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ADDRESS);
 	odp.position = 0x8000001;
 	odp.pfnDlgProc = PSPProcContactHome;
-	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADDRESS);
+	odp.dwInitParam = ICONINDEX(IDI_TREE_ADDRESS);
 	mir_wstrncpy(szTitle + ofs, LPGENW("General") L"\\" LPGENW("Contact (private)"), _countof(szTitle) - ofs);
 	AddPage(wParam, (LPARAM)&odp);
 
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ORIGIN);
 	odp.position = 0x8000002;
 	odp.pfnDlgProc = PSPProcOrigin;
-	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADVANCED);
+	odp.dwInitParam = ICONINDEX(IDI_TREE_ADVANCED);
 	mir_wstrncpy(szTitle + ofs, LPGENW("General") L"\\" LPGENW("Origin"), _countof(szTitle) - ofs);
 	AddPage(wParam, (LPARAM)&odp);
 		
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ANNIVERSARY);
 	odp.position = 0x8000003;
 	odp.pfnDlgProc = PSPProcAnniversary;
-	odp.hIcon = (HICON)ICONINDEX(IDI_BIRTHDAY);
+	odp.dwInitParam = ICONINDEX(IDI_BIRTHDAY);
 	mir_wstrncpy(szTitle + ofs,  LPGENW("General") L"\\" LPGENW("Anniversaries"), _countof(szTitle) - ofs);
 	AddPage(wParam, (LPARAM)&odp);
 
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_COMPANY);
 	odp.position = 0x8000004;
 	odp.pfnDlgProc = PSPProcCompany;
-	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_COMPANY);
+	odp.dwInitParam = ICONINDEX(IDI_TREE_COMPANY);
 	mir_wstrncpy(szTitle + ofs, LPGENW("Work"), _countof(szTitle) - ofs);
 	AddPage(wParam, (LPARAM)&odp);
 
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ADDRESS);
 	odp.position = 0x8000005;
 	odp.pfnDlgProc = PSPProcContactWork;
-	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADDRESS);
+	odp.dwInitParam = ICONINDEX(IDI_TREE_ADDRESS);
 	mir_wstrncpy(szTitle + ofs, LPGENW("Work") L"\\" LPGENW("Contact (work)"), _countof(szTitle) - ofs);
 	AddPage(wParam, (LPARAM)&odp);
 		
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ABOUT);
 	odp.position = 0x8000006;
 	odp.pfnDlgProc = PSPProcAbout;
-	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ABOUT);
+	odp.dwInitParam = ICONINDEX(IDI_TREE_ABOUT);
 	mir_wstrncpy(szTitle + ofs, LPGENW("About"), _countof(szTitle) - ofs);
 	AddPage(wParam, (LPARAM)&odp);
 
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_PROFILE);
 	odp.position = 0x8000007;
 	odp.pfnDlgProc = PSPProcContactProfile;
-	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_PROFILE);
+	odp.dwInitParam = ICONINDEX(IDI_TREE_PROFILE);
 	mir_wstrncpy(szTitle + ofs, LPGENW("About") L"\\" LPGENW("Profile"), _countof(szTitle) - ofs);
 	AddPage(wParam, (LPARAM)&odp);
 	return 0;
@@ -522,7 +522,7 @@ static int InitDetails(WPARAM wParam, LPARAM lParam)
 				odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ABOUT);
 				odp.position = 0x8000008;
 				odp.pfnDlgProc = PSPProcMyNotes;
-				odp.hIcon = (HICON)ICONINDEX(IDI_TREE_NOTES);
+				odp.dwInitParam = ICONINDEX(IDI_TREE_NOTES);
 				AddPage(wParam, (LPARAM)&odp);
 			}
 		}