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,8 +26,8 @@
 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
@@ -126,8 +126,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
 
@@ -214,11 +214,15 @@
         level: 2
         text: i18n("Active Tabs")
         anchors.bottom: configButtons.top
+        width: parent.width
+        horizontalAlignment: Text.AlignHCenter
     }
 
     Kirigami.Heading {
         level: 2
         text: i18n("Inactive Tabs")
         anchors.bottom: 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
@@ -119,6 +119,9 @@
 
     ConfigButtons {
         id: configButtons
+        Layout.alignment: Qt.AlignHCenter
+        Layout.topMargin: units.gridUnit
+        Layout.bottomMargin: -units.gridUnit
     }
 
     Label {
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
     }
 }