diff --git a/applets/kimpanel/package/contents/config/main.xml b/applets/kimpanel/package/contents/config/main.xml
--- a/applets/kimpanel/package/contents/config/main.xml
+++ b/applets/kimpanel/package/contents/config/main.xml
@@ -9,8 +9,8 @@
     <entry name="vertical_lookup_table" type="Bool">
       <default>false</default>
     </entry>
-    <entry name="use_default_font" type="Bool">
-      <default>true</default>
+    <entry name="use_custom_font" type="Bool">
+      <default>false</default>
     </entry>
     <entry name="font" type="Font">
       <default></default>
diff --git a/applets/kimpanel/package/contents/ui/ConfigAppearance.qml b/applets/kimpanel/package/contents/ui/ConfigAppearance.qml
--- a/applets/kimpanel/package/contents/ui/ConfigAppearance.qml
+++ b/applets/kimpanel/package/contents/ui/ConfigAppearance.qml
@@ -16,22 +16,21 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  2.010-1301, USA.
  */
 
-import QtQuick 2.0
-import QtQuick.Controls 1.0 as QtControls
+import QtQuick 2.5
+import QtQuick.Controls 2.5 as QQC2
 import QtQuick.Dialogs 1.1 as QtDialogs
 import QtQuick.Layouts 1.0
 
+import org.kde.kirigami 2.5 as Kirigami
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 
-Item {
+Kirigami.FormLayout {
     id: iconsPage
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
 
     property alias cfg_vertical_lookup_table: verticalLookupTable.checked
-    property alias cfg_use_default_font: useDefaultFont.checked
+    property alias cfg_use_custom_font: useCustomFont.checked
     property font cfg_font
 
     onCfg_fontChanged: {
@@ -41,42 +40,37 @@
         fontDialog.font = cfg_font
     }
 
-    ColumnLayout {
-        id: pageColumn
-        width: parent.width
+    QQC2.CheckBox {
+        id: verticalLookupTable
+        Kirigami.FormData.label: i18n("List:")
+        text: i18n("Vertical")
+    }
 
-        QtControls.CheckBox {
-            id: verticalLookupTable
-            text: i18n("Vertical List")
-        }
+    RowLayout {
+        Kirigami.FormData.label: i18n("Font:")
 
-        QtControls.CheckBox {
-            id: useDefaultFont
-            text: i18n("Use Default Font")
+        QQC2.CheckBox {
+            id: useCustomFont
+            text: i18n("Use custom:")
         }
 
-        RowLayout {
-            width: parent.width
-
-            QtControls.Label {
-                text: i18n("Custom Font:")
-            }
+        QQC2.TextField {
+            enabled: cfg_use_custom_font
+            readOnly: true
+            Kirigami.Theme.inherit: true
+            text: font.family + " " + font.pointSize + "pt"
+            font: font
+            Layout.fillHeight: true
+        }
 
-            QtControls.TextField {
-                id: fontPreviewLabel
-                Layout.fillWidth: true
-                enabled: !cfg_use_default_font
-                anchors.verticalCenter: parent.verticalCenter
-                readOnly: true
-                font: cfg_font
-                text: cfg_font.family + ' ' + cfg_font.pointSize
-            }
+        QQC2.Button {
+            enabled: cfg_use_custom_font
+            icon.name: "document-edit"
+            onClicked: fontDialog.open();
 
-            QtControls.Button {
-                id: fontButton
-                enabled: !cfg_use_default_font
-                text: i18n("Select Font")
-                onClicked: fontDialog.open();
+            QQC2.ToolTip {
+                visible: parent.hovered
+                text: i18n("Select Font...")
             }
         }
     }
diff --git a/applets/kimpanel/package/contents/ui/InputPanel.qml b/applets/kimpanel/package/contents/ui/InputPanel.qml
--- a/applets/kimpanel/package/contents/ui/InputPanel.qml
+++ b/applets/kimpanel/package/contents/ui/InputPanel.qml
@@ -32,7 +32,7 @@
     property bool verticalLayout: false
     property int highlightCandidate: -1
     property int hoveredCandidate: -1
-    property font preferredFont: plasmoid.configuration.use_default_font ? theme.defaultFont : plasmoid.configuration.font
+    property font preferredFont: plasmoid.configuration.use_custom_font ? plasmoid.configuration.font : theme.defaultFont
     property int baseSize: theme.mSize(preferredFont).height
     property rect position