Index: ContextMenu.cpp
===================================================================
--- ContextMenu.cpp	(revision 20653)
+++ ContextMenu.cpp	(working copy)
@@ -832,7 +832,7 @@
     if (idCmd != idCmdFirst)
         InsertMenu(hMenu, indexMenu++, MF_SEPARATOR|MF_BYPOSITION, 0, NULL);
 
-    TweakMenuForVista(hMenu);
+    TweakMenu(hMenu);
 
     return ResultFromScode(MAKE_SCODE(SEVERITY_SUCCESS, 0, (USHORT)(idCmd - idCmdFirst)));
 }
@@ -1087,17 +1087,14 @@
     //separator after
     InsertMenu(hMenu, indexMenu++, MF_SEPARATOR|MF_BYPOSITION, 0, NULL); idCmd++;
 
-    TweakMenuForVista(hMenu);
+    TweakMenu(hMenu);
 
     //return number of menu items added
     return ResultFromScode(MAKE_SCODE(SEVERITY_SUCCESS, 0, (USHORT)(idCmd - idCmdFirst)));
 }
 
-void CShellExt::TweakMenuForVista(HMENU hMenu)
+void CShellExt::TweakMenu(HMENU hMenu)
 {
-    if (!SysInfo::Instance().IsVistaOrLater())
-        return;
-
     MENUINFO MenuInfo = {};
     MenuInfo.cbSize  = sizeof(MenuInfo);
     MenuInfo.fMask   = MIM_STYLE | MIM_APPLYTOSUBMENUS;
@@ -1795,9 +1792,8 @@
             MEASUREITEMSTRUCT* lpmis = (MEASUREITEMSTRUCT*)lParam;
             if (lpmis==NULL)
                 break;
-            lpmis->itemWidth += 2;
-            if (lpmis->itemHeight < 16)
-                lpmis->itemHeight = 16;
+            lpmis->itemWidth = 16;
+			lpmis->itemHeight = 16;
             *pResult = TRUE;
         }
         break;
@@ -1814,7 +1810,7 @@
             if (hIcon == NULL)
                 return S_OK;
             DrawIconEx(lpdis->hDC,
-                lpdis->rcItem.left - 16,
+                lpdis->rcItem.left,
                 lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top - 16) / 2,
                 hIcon, 16, 16,
                 0, NULL, DI_NORMAL);
Index: ShellExt.h
===================================================================
--- ShellExt.h	(revision 20653)
+++ ShellExt.h	(working copy)
@@ -219,7 +219,7 @@
     bool            ShouldInsertItem(const MenuInfo& pair) const;
     bool            ShouldEnableMenu(const YesNoPair& pair) const;
     void            GetColumnInfo(SHCOLUMNINFO* to, DWORD index, UINT charactersCount, UINT titleId, UINT descriptionId);
-    void            TweakMenuForVista(HMENU menu);
+    void            TweakMenu(HMENU menu);
     void            ExtractProperty(const TCHAR* path, const char* propertyName, tstring& to);
 
 public: