diff --git a/reactos/dll/win32/shell32/dialogs.c b/reactos/dll/win32/shell32/dialogs.c
index ca68312eac2..f55ef968546 100644
--- a/reactos/dll/win32/shell32/dialogs.c
+++ b/reactos/dll/win32/shell32/dialogs.c
@@ -38,6 +38,7 @@
 #include "shell32_main.h"
 #include "shresdef.h"
 #include "undocshell.h"
+#include "shlwapi.h"
 
 typedef struct
     {
@@ -60,15 +61,218 @@ static void FillList (HWND, char *) ;
  * PickIconDlg					[SHELL32.62]
  *
  */
-BOOL WINAPI PickIconDlg(
-	HWND hwndOwner,
-	LPWSTR lpstrFile,
-	UINT nMaxFile,
-	INT* lpdwIconIndex)
+
+typedef struct
 {
-	FIXME("(%p,%s,%08x,%p):stub.\n",
-	  hwndOwner, lpstrFile, nMaxFile,lpdwIconIndex);
-	return 0xffffffff;
+    HMODULE hLibrary;
+    HWND hDlgCtrl;
+    WCHAR szName[MAX_PATH];
+    INT Index;
+}PICK_ICON_CONTEXT, *PPICK_ICON_CONTEXT;
+
+BOOL CALLBACK EnumPickIconResourceProc(HMODULE hModule,
+    LPCWSTR lpszType,
+    LPWSTR lpszName,
+    LONG_PTR lParam
+)
+{
+    WCHAR szName[100];
+    int index;
+    HICON  hIcon;
+    PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)lParam;
+
+    if (IS_INTRESOURCE(lpszName))
+        swprintf(szName, L"%u\n", lpszName);
+    else
+        wcscpy(szName, (WCHAR*)lpszName);
+
+
+    hIcon = LoadIconW(pIconContext->hLibrary, (LPCWSTR)lpszName);
+    if (hIcon == NULL)
+        return TRUE;
+
+    index = SendMessageW(pIconContext->hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)szName);
+    if (index != LB_ERR)
+        SendMessageW(pIconContext->hDlgCtrl, LB_SETITEMDATA, index, (LPARAM)hIcon);
+
+    return TRUE;
+}
+
+void
+DestroyIconList(HWND hDlgCtrl)
+{
+    int count;
+    int index;
+
+    count = SendMessage(hDlgCtrl, LB_GETCOUNT, 0, 0);
+    if (count == LB_ERR)
+        return;
+
+    for(index = 0; index < count; index++)
+    {
+        HICON hIcon = (HICON)SendMessageW(hDlgCtrl, LB_GETITEMDATA, index, 0);
+        DestroyIcon(hIcon);
+    }
+}
+
+INT_PTR CALLBACK PickIconProc(HWND hwndDlg,
+    UINT uMsg,
+    WPARAM wParam,
+    LPARAM lParam
+)
+{
+    LPMEASUREITEMSTRUCT lpmis; 
+    LPDRAWITEMSTRUCT lpdis; 
+    HICON hIcon;
+    INT index;
+    WCHAR szText[MAX_PATH], szTitle[100], szFilter[100];
+    OPENFILENAMEW ofn = {0};
+
+    PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)GetWindowLong(hwndDlg, DWLP_USER);
+
+    switch(uMsg)
+    {
+    case WM_INITDIALOG:
+        pIconContext = (PPICK_ICON_CONTEXT)lParam;
+        SetWindowLong(hwndDlg, DWLP_USER, (LONG)pIconContext);
+        pIconContext->hDlgCtrl = GetDlgItem(hwndDlg, IDC_PICKICON_LIST);
+        EnumResourceNamesW(pIconContext->hLibrary, MAKEINTRESOURCEW(RT_ICON), EnumPickIconResourceProc, (LPARAM)pIconContext);
+        if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH))
+            SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)szText);
+        else
+            SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)pIconContext->szName);
+
+        swprintf(szText, L"%u", pIconContext->Index);
+        index = SendMessageW(pIconContext->hDlgCtrl, LB_FINDSTRING, -1, (LPARAM)szText);
+        if (index != LB_ERR)
+            SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, index, 0);
+        return TRUE;
+    case WM_COMMAND:
+        switch(LOWORD(wParam))
+        {
+        case IDOK:
+            index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0);
+            SendMessageW(pIconContext->hDlgCtrl, LB_GETTEXT, index, (LPARAM)szText);
+            pIconContext->Index = _wtoi(szText);
+            SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_GETTEXT, MAX_PATH, (LPARAM)pIconContext->szName);
+            DestroyIconList(pIconContext->hDlgCtrl);
+            EndDialog(hwndDlg, 1);
+            break;
+        case IDCANCEL:
+            DestroyIconList(pIconContext->hDlgCtrl);
+            EndDialog(hwndDlg, 0);
+            break;
+        case IDC_PICKICON_LIST:
+            if (HIWORD(wParam) == LBN_SELCHANGE)
+                InvalidateRect((HWND)lParam, NULL, TRUE); // FIXME USE UPDATE RECT
+            break;
+        case IDC_BUTTON_PATH:
+            szText[0] = 0;
+            szTitle[0] = 0;
+            szFilter[0] = 0;
+            ofn.lStructSize = sizeof(ofn);
+            ofn.hwndOwner = hwndDlg;
+            ofn.lpstrFile = szText;
+            ofn.nMaxFile = MAX_PATH;
+            LoadStringW(shell32_hInstance, IDS_PICK_ICON_TITLE, szTitle, sizeof(szTitle) / sizeof(WCHAR));
+            ofn.lpstrTitle = szTitle;
+            LoadStringW(shell32_hInstance, IDS_PICK_ICON_FILTER, szFilter, sizeof(szFilter) / sizeof(WCHAR));
+            ofn.lpstrFilter = szFilter;
+            if (GetOpenFileNameW(&ofn))
+            {
+                HMODULE hLibrary;
+
+                if (!wcsicmp(pIconContext->szName, szText))
+                    break;
+
+                DestroyIconList(pIconContext->hDlgCtrl);
+
+                hLibrary = LoadLibraryExW(szText, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
+                if (hLibrary == NULL)
+                    break;
+                FreeLibrary(pIconContext->hLibrary);
+                pIconContext->hLibrary = hLibrary;
+                wcscpy(pIconContext->szName, szText);
+                EnumResourceNamesW(pIconContext->hLibrary, MAKEINTRESOURCEW(RT_ICON), EnumPickIconResourceProc, (LPARAM)pIconContext);
+                if (PathUnExpandEnvStringsW(pIconContext->szName, szText, MAX_PATH))
+                    SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)szText);
+                else
+                    SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)pIconContext->szName);
+
+                SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0);
+            }
+            break;
+        }
+        break;
+        case WM_MEASUREITEM:
+            lpmis = (LPMEASUREITEMSTRUCT) lParam; 
+            lpmis->itemHeight = 32;
+            lpmis->itemWidth = 64;
+            return TRUE; 
+        case WM_DRAWITEM: 
+            lpdis = (LPDRAWITEMSTRUCT) lParam; 
+           if (lpdis->itemID == -1) 
+            { 
+                break; 
+            } 
+            switch (lpdis->itemAction) 
+            { 
+                case ODA_SELECT: 
+                case ODA_DRAWENTIRE:
+                    index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0);
+                    hIcon =(HICON)SendMessage(lpdis->hwndItem, LB_GETITEMDATA, lpdis->itemID, (LPARAM) 0);
+
+                    if (lpdis->itemID == index)
+                    {
+                        HBRUSH hBrush;
+                        hBrush = CreateSolidBrush(RGB(0, 0, 255));
+                        FillRect(lpdis->hDC, &lpdis->rcItem, hBrush);
+                        DeleteObject(hBrush);
+                    }
+                    else
+                    {
+                        HBRUSH hBrush;
+                        hBrush = CreateSolidBrush(RGB(255, 255, 255));
+                        FillRect(lpdis->hDC, &lpdis->rcItem, hBrush);
+                        DeleteObject(hBrush);
+                    }
+                    DrawIconEx(lpdis->hDC, lpdis->rcItem.left,lpdis->rcItem.top, hIcon, 
+                                0,
+                                0,
+                                0,
+                                NULL,
+                                DI_NORMAL);
+                    break;
+            }
+    }
+
+    return FALSE;
+}
+
+BOOL WINAPI PickIconDlg(
+    HWND hwndOwner,
+    LPWSTR lpstrFile,
+    UINT nMaxFile,
+    INT* lpdwIconIndex)
+{
+    HMODULE hLibrary;
+    int res;
+    PICK_ICON_CONTEXT IconContext;
+
+    hLibrary = LoadLibraryExW(lpstrFile, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
+    IconContext.hLibrary = hLibrary;
+    IconContext.Index = *lpdwIconIndex;
+    wcscpy(IconContext.szName, lpstrFile);
+
+    res = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_PICK_ICON_DIALOG), hwndOwner, PickIconProc, (LPARAM)&IconContext);
+    if (res)
+    {
+        wcscpy(lpstrFile, IconContext.szName);
+        *lpdwIconIndex = IconContext.Index;
+    }
+
+    FreeLibrary(hLibrary);
+    return res;
 }
 
 /*************************************************************************
diff --git a/reactos/dll/win32/shell32/lang/bg-BG.rc b/reactos/dll/win32/shell32/lang/bg-BG.rc
index 59ca82346a7..ebd7d8c41a4 100644
--- a/reactos/dll/win32/shell32/lang/bg-BG.rc
+++ b/reactos/dll/win32/shell32/lang/bg-BG.rc
@@ -546,6 +546,19 @@ BEGIN
 	AUTOCHECKBOX "&Използване на уплътняване", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
 
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -649,6 +662,8 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Настройки на папките"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 END
 
 
diff --git a/reactos/dll/win32/shell32/lang/ca-ES.rc b/reactos/dll/win32/shell32/lang/ca-ES.rc
index a16a039f08d..d364d01fef5 100644
--- a/reactos/dll/win32/shell32/lang/ca-ES.rc
+++ b/reactos/dll/win32/shell32/lang/ca-ES.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/cs-CZ.rc b/reactos/dll/win32/shell32/lang/cs-CZ.rc
index 2884024a738..0b73e835190 100644
--- a/reactos/dll/win32/shell32/lang/cs-CZ.rc
+++ b/reactos/dll/win32/shell32/lang/cs-CZ.rc
@@ -544,6 +544,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -646,5 +660,6 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
-
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 END
diff --git a/reactos/dll/win32/shell32/lang/da-DK.rc b/reactos/dll/win32/shell32/lang/da-DK.rc
index 5664641c3b0..66192451a36 100644
--- a/reactos/dll/win32/shell32/lang/da-DK.rc
+++ b/reactos/dll/win32/shell32/lang/da-DK.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,6 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
-
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 END
diff --git a/reactos/dll/win32/shell32/lang/de-DE.rc b/reactos/dll/win32/shell32/lang/de-DE.rc
index 9142ba7ddb3..ca65d2ce628 100644
--- a/reactos/dll/win32/shell32/lang/de-DE.rc
+++ b/reactos/dll/win32/shell32/lang/de-DE.rc
@@ -544,6 +544,20 @@ BEGIN
 	AUTOCHECKBOX "&Komprimierung aktivieren", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Ordneroptionen"
 	IDS_RECYCLEBIN_LOCATION     "Papierkorbpfad"
 	IDS_RECYCLEBIN_DISKSPACE    "freier Speicher"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/el-GR.rc b/reactos/dll/win32/shell32/lang/el-GR.rc
index 1e6b360b678..12b0d35778f 100644
--- a/reactos/dll/win32/shell32/lang/el-GR.rc
+++ b/reactos/dll/win32/shell32/lang/el-GR.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/en-GB.rc b/reactos/dll/win32/shell32/lang/en-GB.rc
index b3fa750a834..3eda47f4a68 100644
--- a/reactos/dll/win32/shell32/lang/en-GB.rc
+++ b/reactos/dll/win32/shell32/lang/en-GB.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/en-US.rc b/reactos/dll/win32/shell32/lang/en-US.rc
index d8c74e42502..7a6b21bed53 100644
--- a/reactos/dll/win32/shell32/lang/en-US.rc
+++ b/reactos/dll/win32/shell32/lang/en-US.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,6 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
-
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 END
diff --git a/reactos/dll/win32/shell32/lang/eo-EO.rc b/reactos/dll/win32/shell32/lang/eo-EO.rc
index a74a0c5b24c..d8087ed7ccc 100644
--- a/reactos/dll/win32/shell32/lang/eo-EO.rc
+++ b/reactos/dll/win32/shell32/lang/eo-EO.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/es-ES.rc b/reactos/dll/win32/shell32/lang/es-ES.rc
index 3a87f887342..9e21d0dfbca 100644
--- a/reactos/dll/win32/shell32/lang/es-ES.rc
+++ b/reactos/dll/win32/shell32/lang/es-ES.rc
@@ -545,6 +545,20 @@ BEGIN
 	AUTOCHECKBOX "&Habilitar compresiуn", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -647,5 +661,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Opciones de carpetas"
 	IDS_RECYCLEBIN_LOCATION     "Ubicaciуn de la Papelera de reciclaje"
 	IDS_RECYCLEBIN_DISKSPACE    "Espacio disponible"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/fi-FI.rc b/reactos/dll/win32/shell32/lang/fi-FI.rc
index d7a4c8fae8a..4ac261eb7d3 100644
--- a/reactos/dll/win32/shell32/lang/fi-FI.rc
+++ b/reactos/dll/win32/shell32/lang/fi-FI.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/fr-FR.rc b/reactos/dll/win32/shell32/lang/fr-FR.rc
index ea26a7a3c35..eb56d192dd6 100644
--- a/reactos/dll/win32/shell32/lang/fr-FR.rc
+++ b/reactos/dll/win32/shell32/lang/fr-FR.rc
@@ -547,6 +547,20 @@ BEGIN
 	AUTOCHECKBOX "Activer la compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -649,5 +663,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Options du dossier"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/hu-HU.rc b/reactos/dll/win32/shell32/lang/hu-HU.rc
index 4a062cad36f..dc3e4e6bcd5 100644
--- a/reactos/dll/win32/shell32/lang/hu-HU.rc
+++ b/reactos/dll/win32/shell32/lang/hu-HU.rc
@@ -546,6 +546,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -648,5 +662,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/it-IT.rc b/reactos/dll/win32/shell32/lang/it-IT.rc
index 6da123e5268..19e8fc07159 100644
--- a/reactos/dll/win32/shell32/lang/it-IT.rc
+++ b/reactos/dll/win32/shell32/lang/it-IT.rc
@@ -544,6 +544,20 @@ BEGIN
 	AUTOCHECKBOX "Abilita la &Compressione", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -646,5 +660,6 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Opzioni della cartella"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
-
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 END
diff --git a/reactos/dll/win32/shell32/lang/ja-JP.rc b/reactos/dll/win32/shell32/lang/ja-JP.rc
index c23e4da14fe..b2ce00fed3d 100644
--- a/reactos/dll/win32/shell32/lang/ja-JP.rc
+++ b/reactos/dll/win32/shell32/lang/ja-JP.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/ko-KO.rc b/reactos/dll/win32/shell32/lang/ko-KO.rc
index 26a4c6da9e2..25254df472b 100644
--- a/reactos/dll/win32/shell32/lang/ko-KO.rc
+++ b/reactos/dll/win32/shell32/lang/ko-KO.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/nb-NO.rc b/reactos/dll/win32/shell32/lang/nb-NO.rc
index 627aeb30280..30a7bd60d13 100644
--- a/reactos/dll/win32/shell32/lang/nb-NO.rc
+++ b/reactos/dll/win32/shell32/lang/nb-NO.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/nl-NL.rc b/reactos/dll/win32/shell32/lang/nl-NL.rc
index acbc1423c13..b2220ac1a93 100644
--- a/reactos/dll/win32/shell32/lang/nl-NL.rc
+++ b/reactos/dll/win32/shell32/lang/nl-NL.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc
index acb552f7d77..f6d1eed3ffb 100644
--- a/reactos/dll/win32/shell32/lang/pl-PL.rc
+++ b/reactos/dll/win32/shell32/lang/pl-PL.rc
@@ -549,6 +549,20 @@ BEGIN
 	AUTOCHECKBOX "&Wі№cz kompresjк", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -651,5 +665,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Opcje Katalogуw"
 	IDS_RECYCLEBIN_LOCATION     "Lokalizacja Kosza"
 	IDS_RECYCLEBIN_DISKSPACE    "Pozostaіo wolnego miejsca"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/pt-BR.rc b/reactos/dll/win32/shell32/lang/pt-BR.rc
index 0fab70c8cb2..3b456af0a37 100644
--- a/reactos/dll/win32/shell32/lang/pt-BR.rc
+++ b/reactos/dll/win32/shell32/lang/pt-BR.rc
@@ -545,6 +545,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -647,5 +661,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/pt-PT.rc b/reactos/dll/win32/shell32/lang/pt-PT.rc
index c980a0b4625..0875065968a 100644
--- a/reactos/dll/win32/shell32/lang/pt-PT.rc
+++ b/reactos/dll/win32/shell32/lang/pt-PT.rc
@@ -545,6 +545,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -647,5 +661,6 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
-
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 END
diff --git a/reactos/dll/win32/shell32/lang/ru-RU.rc b/reactos/dll/win32/shell32/lang/ru-RU.rc
index fe5eb5b575c..ff86e0797d9 100644
--- a/reactos/dll/win32/shell32/lang/ru-RU.rc
+++ b/reactos/dll/win32/shell32/lang/ru-RU.rc
@@ -542,6 +542,20 @@ BEGIN
 	AUTOCHECKBOX "&Использовать сжатие", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -643,5 +657,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Свойства папки"
 	IDS_RECYCLEBIN_LOCATION     "Расположение Корзины"
 	IDS_RECYCLEBIN_DISKSPACE    "Доступное пространство"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc
index dbb976b5be2..6b9b051ca99 100644
--- a/reactos/dll/win32/shell32/lang/sk-SK.rc
+++ b/reactos/dll/win32/shell32/lang/sk-SK.rc
@@ -549,6 +549,20 @@ BEGIN
 	AUTOCHECKBOX "Z&apnъќ kompresiu", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -651,5 +665,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Moћnosti prieиinka"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/sl-SI.rc b/reactos/dll/win32/shell32/lang/sl-SI.rc
index e0b6dd6879e..48f52626ba9 100644
--- a/reactos/dll/win32/shell32/lang/sl-SI.rc
+++ b/reactos/dll/win32/shell32/lang/sl-SI.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/sv-SE.rc b/reactos/dll/win32/shell32/lang/sv-SE.rc
index 676a353acfc..e6aed025020 100644
--- a/reactos/dll/win32/shell32/lang/sv-SE.rc
+++ b/reactos/dll/win32/shell32/lang/sv-SE.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/tr-TR.rc b/reactos/dll/win32/shell32/lang/tr-TR.rc
index 20bd0894a47..0464e7b1a3a 100644
--- a/reactos/dll/win32/shell32/lang/tr-TR.rc
+++ b/reactos/dll/win32/shell32/lang/tr-TR.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/uk-UA.rc b/reactos/dll/win32/shell32/lang/uk-UA.rc
index 4f8a307d705..4b82717bb66 100644
--- a/reactos/dll/win32/shell32/lang/uk-UA.rc
+++ b/reactos/dll/win32/shell32/lang/uk-UA.rc
@@ -544,6 +544,20 @@ BEGIN
 	AUTOCHECKBOX "&Використовувати стискання", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -646,5 +660,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Властивості папки"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/wa-WA.rc b/reactos/dll/win32/shell32/lang/wa-WA.rc
index d622ee69109..5f4a457024b 100644
--- a/reactos/dll/win32/shell32/lang/wa-WA.rc
+++ b/reactos/dll/win32/shell32/lang/wa-WA.rc
@@ -543,6 +543,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -645,5 +659,7 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 
 END
diff --git a/reactos/dll/win32/shell32/lang/zh-CN.rc b/reactos/dll/win32/shell32/lang/zh-CN.rc
index 63a0a11c1b1..13e7e620a00 100644
--- a/reactos/dll/win32/shell32/lang/zh-CN.rc
+++ b/reactos/dll/win32/shell32/lang/zh-CN.rc
@@ -544,6 +544,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE DISCARDABLE
 BEGIN
 	/* columns in the shellview */
@@ -646,7 +660,8 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
-
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 END
 
 #pragma code_page(default)
diff --git a/reactos/dll/win32/shell32/lang/zh-TW.rc b/reactos/dll/win32/shell32/lang/zh-TW.rc
index 3fb633d7eec..f96f9fc9c68 100644
--- a/reactos/dll/win32/shell32/lang/zh-TW.rc
+++ b/reactos/dll/win32/shell32/lang/zh-TW.rc
@@ -544,6 +544,20 @@ BEGIN
 	AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10
 END
 
+IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION
+CAPTION "Change Icon"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT "Filename:", -1, 7, 14, 208, 10
+    PUSHBUTTON      "Browse...",IDC_BUTTON_PATH, 148, 24,67,14
+    EDITTEXT        IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL
+    LTEXT "Icons:", -1, 7, 47, 208, 10
+    LISTBOX         IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE
+    DEFPUSHBUTTON   "OK",IDOK, 107, 181,50, 14
+    PUSHBUTTON      "Cancel",IDCANCEL, 167, 181, 50, 14
+END
+
 STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 BEGIN
 	/* columns in the shellview */
@@ -646,7 +660,8 @@ BEGIN
 	IDS_FOLDER_OPTIONS          "Folder Options"
 	IDS_RECYCLEBIN_LOCATION     "Recycle Bin Location"
 	IDS_RECYCLEBIN_DISKSPACE    "Space Available"
-
+	IDS_PICK_ICON_TITLE         "Choose Icon"
+        IDS_PICK_ICON_FILTER        "Icon Files(*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0"
 END
 
 #pragma code_page(default)
diff --git a/reactos/dll/win32/shell32/shell32.rbuild b/reactos/dll/win32/shell32/shell32.rbuild
index ad4d323a951..3a496e0a055 100644
--- a/reactos/dll/win32/shell32/shell32.rbuild
+++ b/reactos/dll/win32/shell32/shell32.rbuild
@@ -18,6 +18,7 @@
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>comctl32</library>
+	<library>comdlg32</library>
 	<library>shlwapi</library>
 	<library>ole32</library>
 	<library>version</library>
@@ -74,4 +75,5 @@
 	<file>shv_item_new.c</file>
 	<file>folder_options.c</file>
 	<file>shfldr_netplaces.c</file>
+	<file>shv_default_context_menu.c</file>
 </module>
diff --git a/reactos/dll/win32/shell32/shelllink.c b/reactos/dll/win32/shell32/shelllink.c
index e5c890b2dce..5729ad8c220 100644
--- a/reactos/dll/win32/shell32/shelllink.c
+++ b/reactos/dll/win32/shell32/shelllink.c
@@ -2681,6 +2681,9 @@ SH_ShellLinkDlgProc(
                ///
                return TRUE;
            case 14021:
+               if (This->sIcoPath)
+                    wcscpy(szBuffer, This->sIcoPath);
+               IconIndex = This->iIcoNdx;
                if (PickIconDlg(hwndDlg, szBuffer, MAX_PATH, &IconIndex))
                {
                     IShellLinkW_fnSetIconLocation((IShellLinkW*)&This->lpvtblw, szBuffer, IconIndex);
diff --git a/reactos/dll/win32/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h
index f0ace1b6998..a021754baa8 100644
--- a/reactos/dll/win32/shell32/shresdef.h
+++ b/reactos/dll/win32/shell32/shresdef.h
@@ -149,6 +149,12 @@
 #define IDD_SHELL_ABOUT_AUTHORS           0x4100
 #define IDC_SHELL_ABOUT_AUTHORS           0x4101
 #define IDC_SHELL_ABOUT_AUTHORS_LISTBOX   0x4102
+#define IDD_PICK_ICON_DIALOG              0x4120
+#define IDC_PICKICON_LIST                 0x4121
+#define IDC_BUTTON_PATH                   0x4122
+#define IDC_EDIT_PATH                     0x4123
+#define IDS_PICK_ICON_TITLE               0x4124
+#define IDS_PICK_ICON_FILTER              0x4125
 
 #define IDI_SHELL_DOCUMENT           1
 #define IDI_SHELL_FOLDER             4