Index: containments/desktop/package/contents/ui/FolderView.qml
===================================================================
--- containments/desktop/package/contents/ui/FolderView.qml
+++ containments/desktop/package/contents/ui/FolderView.qml
@@ -1248,24 +1248,21 @@
                    _x = targetItem.labelArea.x - __style.padding.left;
                    _y = pos.y - __style.padding.top;
                 } else {
-                    _x = targetItem.x + Math.abs(Math.min(gridView.contentX, gridView.originX));
-                    _x += (targetItem.width/2 - targetItem.label.paintedWidth/2 - __style.padding.left);
-                    _x += scrollArea.viewport.x;
-
-                    if (verticalScrollBarPolicy == Qt.ScrollBarAlwaysOn
-                        && gridView.effectiveLayoutDirection == Qt.RightToLeft) {
-                        _x -= __verticalScrollBar.parent.verticalScrollbarOffset;
-                    }
-
-                   _y = pos.y + units.smallSpacing - __style.padding.top;
+                    _x = targetItem.x + units.largeSpacing - units.smallSpacing - __style.padding.left;
+                    _y = pos.y + units.smallSpacing - __style.padding.top;
                 }
                 return([ _x, _y ]);
             }
             
             function getWidth(addWidthVerticalScroller) {
-                var _width = root.useListViewMode ? targetItem.width - units.largeSpacing * 2 : targetItem.label.paintedWidth;
-                return _width + __style.padding.left + __style.padding.right +
-                       (addWidthVerticalScroller ? __verticalScrollBar.parent.verticalScrollbarOffset : 0);
+                var _width = targetItem.width - units.largeSpacing * 2 + __style.padding.left + __style.padding.right;
+                if(!root.useListViewMode) {
+                    _width += units.smallSpacing * 2;
+                    if(addWidthVerticalScroller) {
+                        _width += __verticalScrollBar.parent.verticalScrollbarOffset;
+                    }
+                }
+                return(_width);
             }
             
             function getHeight(addWidthHoriozontalScroller, init) {