Index: listview.c
===================================================================
--- listview.c	(revision 58619)
+++ listview.c	(working copy)
@@ -4723,9 +4723,13 @@
     if (infoPtr->hwndEdit && nItem == infoPtr->nEditLabelItem && nSubItem == 0) goto postpaint;
    
     /* figure out the text drawing flags */
-    uFormat = (infoPtr->uView == LV_VIEW_ICON ? (lprcFocus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS) : LV_SL_DT_FLAGS);
+    uFormat = LV_SL_DT_FLAGS;
     if (infoPtr->uView == LV_VIEW_ICON)
-	uFormat = (lprcFocus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS);
+    {
+        uFormat = (lprcFocus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS);
+        rcLabel.left += TRAILING_LABEL_PADDING / 2;
+        rcLabel.right -= TRAILING_LABEL_PADDING / 2;
+    }
     else if (nSubItem)
     {
 	switch (LISTVIEW_GetColumnInfo(infoPtr, nSubItem)->fmt & LVCFMT_JUSTIFYMASK)