Index: dialogs/filedefext.cpp
===================================================================
--- dialogs/filedefext.cpp	(revision 66727)
+++ dialogs/filedefext.cpp	(working copy)
@@ -306,8 +306,10 @@
                 ShowWindow(hIconCtrl, SW_SHOW);
                 RECT rcIcon, rcDescr;
                 GetWindowRect(hIconCtrl, &rcIcon);
-                if (rcIcon.left == rcIcon.right)
-                    ERR("Icon control has invalid width: %d-%d\n", rcIcon.left, rcIcon.right);
+
+                rcIcon.right += GetSystemMetrics(SM_CXSMICON);
+                rcIcon.bottom += GetSystemMetrics(SM_CYSMICON);
+
                 MapWindowPoints(NULL, hwndDlg, (LPPOINT)&rcIcon, 2);
                 GetWindowRect(hDescrCtrl, &rcDescr);
                 MapWindowPoints(NULL, hwndDlg, (LPPOINT)&rcDescr, 2);
Index: lang/en-US.rc
===================================================================
--- lang/en-US.rc	(revision 66727)
+++ lang/en-US.rc	(working copy)
@@ -246,7 +246,7 @@
     LTEXT "Type of file:", 14004, 8, 35, 50, 10
     CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 68, 35, 160, 10
     LTEXT "Opens with:", 14006, 8, 53, 50, 10
-    ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE
+    ICON "", 14025, 68, 52, 0, 0, NOT WS_VISIBLE
     PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
     EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP
     LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE