Index: base/applications/regedit/regedit.rc
===================================================================
--- base/applications/regedit/regedit.rc	(revision 70453)
+++ base/applications/regedit/regedit.rc	(working copy)
@@ -33,9 +33,6 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDI_OPEN_FILE ICON "res/folderopen.ico"
-IDI_CLOSED_FILE ICON "res/folder.ico"
-IDI_ROOT ICON "res/computer.ico"
 IDI_STRING ICON "res/string.ico"
 IDI_BIN ICON "res/bin.ico"
 IDI_REGEDIT ICON "res/regedit.ico"
Index: base/applications/regedit/res/computer.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: base/applications/regedit/res/folder.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: base/applications/regedit/res/folderopen.ico
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: base/applications/regedit/resource.h
===================================================================
--- base/applications/regedit/resource.h	(revision 70453)
+++ base/applications/regedit/resource.h	(working copy)
@@ -39,9 +39,6 @@
 #define IDC_REGEDIT_FRAME             110
 #define IDR_REGEDIT_MENU              130
 #define IDD_EXPORTRANGE               131
-#define IDI_OPEN_FILE                 132
-#define IDI_CLOSED_FILE               133
-#define IDI_ROOT                      134
 #define IDI_STRING                    135
 #define IDI_BIN                       136
 #define IDR_POPUP_MENUS               137
Index: base/applications/regedit/treeview.c
===================================================================
--- base/applications/regedit/treeview.c	(revision 70453)
+++ base/applications/regedit/treeview.c	(working copy)
@@ -439,6 +439,7 @@
 {
     HIMAGELIST himl;  /* handle to image list  */
     HICON hico;       /* handle to icon  */
+    HMODULE hShell32; /* handle to shell32 DLL */
 
     /* Create the image list.  */
     if ((himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON),
@@ -451,8 +452,10 @@
     }
 
     /* Add the open file, closed file, and document bitmaps.  */
-    hico = LoadImageW(hInst,
-                      MAKEINTRESOURCEW(IDI_OPEN_FILE),
+    hShell32 = GetModuleHandleA("SHELL32");
+
+    hico = LoadImageW(hShell32,
+                      MAKEINTRESOURCEW(5),
                       IMAGE_ICON,
                       GetSystemMetrics(SM_CXSMICON),
                       GetSystemMetrics(SM_CYSMICON),
@@ -463,8 +466,8 @@
         DestroyIcon(hico);
     }
 
-    hico = LoadImageW(hInst,
-                      MAKEINTRESOURCEW(IDI_CLOSED_FILE),
+    hico = LoadImageW(hShell32,
+                      MAKEINTRESOURCEW(4),
                       IMAGE_ICON,
                       GetSystemMetrics(SM_CXSMICON),
                       GetSystemMetrics(SM_CYSMICON),
@@ -475,8 +478,8 @@
         DestroyIcon(hico);
     }
 
-    hico = LoadImageW(hInst,
-                      MAKEINTRESOURCEW(IDI_ROOT),
+    hico = LoadImageW(hShell32,
+                      MAKEINTRESOURCEW(16),
                       IMAGE_ICON,
                       GetSystemMetrics(SM_CXSMICON),
                       GetSystemMetrics(SM_CYSMICON),