Index: dll/win32/comctl32/listview.c
===================================================================
--- dll/win32/comctl32/listview.c	(revision 70479)
+++ dll/win32/comctl32/listview.c	(working copy)
@@ -4664,9 +4664,13 @@
     if (infoPtr->hwndEdit && item->iItem == infoPtr->nEditLabelItem && item->iSubItem == 0) return;
 
     /* figure out the text drawing flags */
-    format = (infoPtr->uView == LV_VIEW_ICON ? (focus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS) : LV_SL_DT_FLAGS);
+    format = LV_SL_DT_FLAGS;
     if (infoPtr->uView == LV_VIEW_ICON)
-	format = (focus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS);
+    {
+        format = (focus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS);
+        rcLabel.left += TRAILING_LABEL_PADDING / 2;
+        rcLabel.right -= TRAILING_LABEL_PADDING / 2;
+    }
     else if (item->iSubItem)
     {
 	switch (LISTVIEW_GetColumnInfo(infoPtr, item->iSubItem)->fmt & LVCFMT_JUSTIFYMASK)