diff --git a/applets/kickoff/package/contents/ui/ConfigButtons.qml b/applets/kickoff/package/contents/ui/ConfigButtons.qml
--- a/applets/kickoff/package/contents/ui/ConfigButtons.qml
+++ b/applets/kickoff/package/contents/ui/ConfigButtons.qml
@@ -26,11 +26,11 @@
 GridView {
     id: configButtons
 
-    cellHeight: units.gridUnit * 6 + units.smallSpacing
-    cellWidth: units.gridUnit * 6
+    cellHeight: units.gridUnit * 5 + units.smallSpacing
+    cellWidth: units.gridUnit * 5
 
-    width: cellWidth * 5
-    height: cellHeight * 2
+    implicitWidth: cellWidth * 5
+    implicitHeight: cellHeight * 2
 
     property var items: {
         "bookmark":    { icon: "bookmarks", text: i18n("Favorites")},
@@ -106,7 +106,6 @@
         }
     }
 
-
     displaced: Transition {
         NumberAnimation { properties: "x,y"; easing.type: Easing.OutQuad }
     }
@@ -126,8 +125,8 @@
         delegate: MouseArea {
             id: delegateRoot
 
-            width: units.gridUnit * 6
-            height: units.gridUnit * 5
+            width: units.gridUnit * 5
+            height: units.gridUnit * 4
 
             property int visualIndex: DelegateModel.itemsIndex
 
@@ -210,15 +209,19 @@
         }
     }
 
-    Kirigami.Heading {
+    header: Kirigami.Heading {
         level: 2
         text: i18n("Active Tabs")
-        anchors.bottom: configButtons.top
+        width: parent.width
+        horizontalAlignment: Text.AlignHCenter
     }
 
+    // the middle label is placed right the middle of the grid view, which is a single grid with a gap in the middle
     Kirigami.Heading {
         level: 2
         text: i18n("Inactive Tabs")
-        anchors.bottom: configButtons.verticalCenter
+        anchors.top: configButtons.verticalCenter
+        width: parent.width
+        horizontalAlignment: Text.AlignHCenter
     }
 }
diff --git a/applets/kickoff/package/contents/ui/ConfigGeneral.qml b/applets/kickoff/package/contents/ui/ConfigGeneral.qml
--- a/applets/kickoff/package/contents/ui/ConfigGeneral.qml
+++ b/applets/kickoff/package/contents/ui/ConfigGeneral.qml
@@ -34,7 +34,6 @@
     property alias cfg_menuItems: configButtons.menuItems
 
     Kirigami.FormLayout {
-
         Button {
             id: iconButton
 
@@ -111,19 +110,19 @@
             id: alphaSort
             text: i18n("Sort alphabetically")
         }
-
-        Item {
-            Kirigami.FormData.isSection: true
-        }
     }
 
     ConfigButtons {
         id: configButtons
+        Layout.alignment: Qt.AlignHCenter
     }
-
     Label {
         Layout.fillWidth: true
         text: i18n("Drag tabs between the boxes to show/hide them, or reorder the visible tabs by dragging.")
         wrapMode: Text.WordWrap
     }
+
+    Item {
+        Layout.fillHeight: true
+    }
 }
diff --git a/applets/kickoff/package/contents/ui/KickoffConfigurationButton.qml b/applets/kickoff/package/contents/ui/KickoffConfigurationButton.qml
--- a/applets/kickoff/package/contents/ui/KickoffConfigurationButton.qml
+++ b/applets/kickoff/package/contents/ui/KickoffConfigurationButton.qml
@@ -19,41 +19,42 @@
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import QtQuick.Controls 1.0 as QtControls
+import QtQuick.Layouts 1.1
 import org.kde.kquickcontrolsaddons 2.0
 
 PlasmaCore.FrameSvgItem {
     id: button
     property alias icon: iconElement.source
     property alias text: textElement.text
     property string name
 
-    width: units.gridUnit * 6
-    height: units.gridUnit * 5
+    width: units.gridUnit * 5
+    height: units.gridUnit * 4
 
     visible: name != "empty"
 
     imagePath: "widgets/background"
 
-    PlasmaCore.IconItem {
-        id: iconElement
-
+    ColumnLayout {
         anchors.centerIn: parent
-        width: units.iconSizes.medium
-        height: width
 
-        source: icon
-    }
+        PlasmaCore.IconItem {
+            id: iconElement
+
+            Layout.alignment: Qt.AlignHCenter
+            Layout.preferredWidth: units.iconSizes.medium
+            Layout.preferredHeight: width
+
+            source: icon
+        }
 
-    QtControls.Label {
-        id: textElement
-        anchors {
-            top: iconElement.bottom
-            left: parent.left
-            right: parent.right
+        QtControls.Label {
+            id: textElement
+            Layout.alignment: Qt.AlignHCenter
+            horizontalAlignment: Text.AlignHCenter
+            elide: Text.ElideRight
+            color: PlasmaCore.ColorScope.textColor
+            font.pointSize: theme.smallestFont.pointSize
         }
-        horizontalAlignment: Text.AlignHCenter
-        elide: Text.ElideRight
-        color: PlasmaCore.ColorScope.textColor
-        font.pointSize: theme.smallestFont.pointSize
     }
 }