diff --git a/containments/desktop/package/contents/ui/ConfigIcons.qml b/containments/desktop/package/contents/ui/ConfigIcons.qml
--- a/containments/desktop/package/contents/ui/ConfigIcons.qml
+++ b/containments/desktop/package/contents/ui/ConfigIcons.qml
@@ -146,50 +146,38 @@
             visible: isPopup
         }
 
-        // Row 2: "Arrangment" - "Arrange in"
+        // Row 2: "Arrangment"
         Label {
             Layout.row: 2
             Layout.column: 0
 
             text: i18n("Arrangement:")
-        }
-
-        Label {
-            Layout.row: 2
-            Layout.column: 1
-
-            text: i18n("Arrange in")
+            width: 500
+            Layout.alignment: Qt.AlignRight
         }
 
         ComboBox {
             id: arrangement
             Layout.row: 2
-            Layout.column: 2
-            Layout.columnSpan: 2
+            Layout.column: 1
+            Layout.columnSpan: 3
             Layout.fillWidth: true
 
             model: [i18n("Rows"), i18n("Columns")]
         }
 
-        // Row 3: "Arrangment" - "Align"
-        Label {
-            Layout.row: 3
-            Layout.column: 1
-
-            text: i18n("Align")
-        }
-
+        // Row 3: "Arrangement" - Alignment
         ComboBox {
             id: alignment
             Layout.row: 3
-            Layout.column: 2
-            Layout.columnSpan: 2
+            Layout.column: 1
+            Layout.columnSpan: 3
             Layout.fillWidth: true
 
-            model: [i18n("Left"), i18n("Right")]
+            model: [i18n("Align Left"), i18n("Align Right")]
         }
 
-        // Row 4: "Arrangment" - "Lock"
+        // Row 4: "Arrangment" - Lock in place
         CheckBox {
             id: locked
             Layout.row: 4
@@ -216,26 +204,21 @@
             Layout.minimumHeight: units.largeSpacing
         }
 
-        // Row 6: "Sorting" - "Sort by"
+        // Row 6: "Sorting"
         Label {
             Layout.row: 6
             Layout.column: 0
+            width: 500
+            Layout.alignment: Qt.AlignRight
 
             text: i18n("Sorting:")
         }
 
-        Label {
-            Layout.row: 6
-            Layout.column: 1
-
-            text: i18n("Sort by")
-        }
-
         ComboBox {
             id: sortMode
             Layout.row: 6
-            Layout.column: 2
-            Layout.columnSpan: 2
+            Layout.column: 1
+            Layout.columnSpan: 3
             Layout.fillWidth: true
 
             property int mode
@@ -281,50 +264,34 @@
             Layout.minimumHeight: units.largeSpacing
         }
 
-        // Row 10: "Appearance" - "View mode"
+        // Row 10: "Size" or "View mode"
         Label {
             Layout.row: (isPopup ? 10 : 11)
             Layout.column: 0
+            width: 500
+            Layout.alignment: Qt.AlignRight
 
-            text: i18n("Appearance:")
-        }
-
-        Label {
-            Layout.row: 10
-            Layout.column: 1
-
-            visible: isPopup
-
-            text: i18nc("whether to use icon or list view", "View mode")
+            text: isPopup ? i18nc("whether to use icon or list view", "View mode:") : i18n("Size:")
         }
 
         ComboBox {
             id: viewMode
             Layout.row: 10
-            Layout.column: 2
-            Layout.columnSpan: 2
+            Layout.column: 1
+            Layout.columnSpan: 3
             Layout.fillWidth: true
 
             visible: isPopup
 
             model: [i18n("List"), i18n("Icons")]
         }
 
         // Rows 11+12: "Appearance" - "Size"
-        Label {
-            Layout.row: 11
-            Layout.column: 1
-
-            visible: !isPopup || viewMode.currentIndex === 1
-
-            text: i18n("Size")
-        }
-
         Slider {
             id: iconSize
             Layout.row: 11
-            Layout.column: 2
-            Layout.columnSpan: 2
+            Layout.column: 1
+            Layout.columnSpan: 3
             Layout.fillWidth: true
 
             visible: !isPopup || viewMode.currentIndex === 1
@@ -385,10 +352,12 @@
             Layout.minimumHeight: units.largeSpacing
         }
 
-        // Row 15: "Features" - "Tool tips"
+        // Row 15: "Features" - "Tooltips"
         Label {
             Layout.row: 15
             Layout.column: 0
+            width: 500
+            Layout.alignment: Qt.AlignRight
 
             text: i18n("Features:")
         }
@@ -399,7 +368,7 @@
             Layout.column: 1
             Layout.columnSpan: 3
 
-            text: i18n("Tool tips")
+            text: i18n("Tooltips")
         }
 
         // Row 16: "Features" - "Selection markers"
@@ -439,8 +408,7 @@
         Button {
             id: previewSettings
             Layout.row: 19
-            Layout.column: 3
-            Layout.alignment: Qt.AlignRight
+            Layout.column: 1
 
             text: i18n("More Preview Options...")