diff --git a/containments/desktop/package/contents/config/main.xml b/containments/desktop/package/contents/config/main.xml
--- a/containments/desktop/package/contents/config/main.xml
+++ b/containments/desktop/package/contents/config/main.xml
@@ -104,7 +104,7 @@
     </entry>
     <entry name="textLines" type="Int">
       <label>The (maximum) number of lines of text to use below Folder View icons.</label>
-      <default>2</default>
+      <default>3</default>
     </entry>
     <entry name="textColor" type="String">
       <label>The text color to use below Folder View icons. Only used when serving as containment.</label>
diff --git a/containments/desktop/package/contents/ui/FolderItemDelegate.qml b/containments/desktop/package/contents/ui/FolderItemDelegate.qml
--- a/containments/desktop/package/contents/ui/FolderItemDelegate.qml
+++ b/containments/desktop/package/contents/ui/FolderItemDelegate.qml
@@ -308,7 +308,7 @@
                             PropertyChanges {
                                 target: label
                                 anchors.topMargin: units.smallSpacing
-                                width: Math.min(label.implicitWidth + units.smallSpacing, parent.width - units.smallSpacing * 4)
+                                width: Math.min(label.implicitWidth + units.smallSpacing, parent.width - units.smallSpacing)
                                 maximumLineCount: plasmoid.configuration.textLines
                                 horizontalAlignment: Text.AlignHCenter
                             }
diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
--- a/containments/desktop/package/contents/ui/FolderView.qml
+++ b/containments/desktop/package/contents/ui/FolderView.qml
@@ -582,7 +582,7 @@
                     if (root.useListViewMode) {
                         return gridView.width;
                     } else {
-                        var iconWidth = iconSize + (2 * units.largeSpacing) + (2 * units.smallSpacing);
+                        var iconWidth = iconSize + (2 * units.largeSpacing) + (4 * units.smallSpacing);
                         if (root.isContainment && isRootView && scrollArea.viewportWidth > 0) {
                             var extraWidth = calcExtraSpacing(iconWidth, scrollArea.viewportWidth);
                             return iconWidth + extraWidth;