--- src/xfdesktop-icon-view.c.orig	2013-12-19 15:43:08.873988874 -0500
+++ src/xfdesktop-icon-view.c	2013-12-19 15:47:29.137311853 -0500
@@ -60,7 +60,9 @@
 #define CELL_PADDING      (icon_view->priv->cell_padding)
 #define CELL_SIZE         (TEXT_WIDTH + CELL_PADDING * 2)
 #define SPACING           (icon_view->priv->cell_spacing)
-#define SCREEN_MARGIN     8
+#define SCREEN_MARGIN      8
+#define SCREEN_XMARGIN     100
+#define SCREEN_YMARGIN     8
 #define DEFAULT_RUBBERBAND_ALPHA  64
 
 #if defined(DEBUG) && DEBUG > 0
@@ -1271,8 +1273,8 @@
 {
     g_return_if_fail(row && col);
     
-    *row = (y - icon_view->priv->yorigin - SCREEN_MARGIN) / CELL_SIZE;
-    *col = (x - icon_view->priv->xorigin - SCREEN_MARGIN) / CELL_SIZE;
+    *row = (y - icon_view->priv->yorigin - SCREEN_YMARGIN) / CELL_SIZE;
+    *col = (x - icon_view->priv->xorigin - SCREEN_XMARGIN) / CELL_SIZE;
 }
 
 static inline void
@@ -1323,8 +1325,8 @@
     GdkRectangle *cell_highlight;
     gint newx, newy;
     
-    newx = SCREEN_MARGIN + icon_view->priv->xorigin + col * CELL_SIZE;
-    newy = SCREEN_MARGIN + icon_view->priv->yorigin + row * CELL_SIZE;
+    newx = SCREEN_XMARGIN + icon_view->priv->xorigin + col * CELL_SIZE;
+    newy = SCREEN_YMARGIN + icon_view->priv->yorigin + row * CELL_SIZE;
     
     cell_highlight = g_object_get_qdata(G_OBJECT(context),
                                         xfdesktop_cell_highlight_quark);
@@ -2495,8 +2497,8 @@
         for(col = 0; col < icon_view->priv->ncols; ++col) {
             gboolean bounded = FALSE;
             
-            cell_rect.x = SCREEN_MARGIN + icon_view->priv->xorigin + col * CELL_SIZE;
-            cell_rect.y = SCREEN_MARGIN + icon_view->priv->yorigin + row * CELL_SIZE;
+            cell_rect.x = SCREEN_XMARGIN + icon_view->priv->xorigin + col * CELL_SIZE;
+            cell_rect.y = SCREEN_YMARGIN + icon_view->priv->yorigin + row * CELL_SIZE;
             
             for(i = 0; i < nmonitors; ++i) {
                 if(xfdesktop_rectangle_is_bounded_by(&cell_rect,
@@ -2544,8 +2546,8 @@
     icon_view->priv->width = width;
     icon_view->priv->height = height;
         
-    icon_view->priv->nrows = (height - SCREEN_MARGIN * 2) / CELL_SIZE;
-    icon_view->priv->ncols = (width - SCREEN_MARGIN * 2) / CELL_SIZE;
+    icon_view->priv->nrows = (height - SCREEN_YMARGIN * 2) / CELL_SIZE;
+    icon_view->priv->ncols = (width - SCREEN_XMARGIN * 2) / CELL_SIZE;
         
     DBG("CELL_SIZE=%0.3f, TEXT_WIDTH=%0.3f, ICON_SIZE=%u", CELL_SIZE, TEXT_WIDTH, ICON_SIZE);
     DBG("grid size is %dx%d", icon_view->priv->nrows, icon_view->priv->ncols);
@@ -2825,8 +2827,8 @@
         return FALSE;
     }
 
-    area->x += SCREEN_MARGIN + icon_view->priv->xorigin + col * CELL_SIZE;
-    area->y += SCREEN_MARGIN + icon_view->priv->yorigin + row * CELL_SIZE;
+    area->x += SCREEN_XMARGIN + icon_view->priv->xorigin + col * CELL_SIZE;
+    area->y += SCREEN_YMARGIN + icon_view->priv->yorigin + row * CELL_SIZE;
 
     return TRUE;
 }
@@ -3420,8 +3422,8 @@
                      G_CALLBACK(xfdesktop_icon_view_icon_changed),
                      icon_view);
     
-    fake_area.x = SCREEN_MARGIN + icon_view->priv->xorigin + col * CELL_SIZE;
-    fake_area.y = SCREEN_MARGIN + icon_view->priv->yorigin + row * CELL_SIZE;
+    fake_area.x = SCREEN_XMARGIN + icon_view->priv->xorigin + col * CELL_SIZE;
+    fake_area.y = SCREEN_YMARGIN + icon_view->priv->yorigin + row * CELL_SIZE;
     fake_area.width = fake_area.height = CELL_SIZE;
     xfdesktop_icon_view_paint_icon(icon_view, icon, &fake_area);
 }