diff --git a/applets/quickshare/plasmoid/contents/config/config.qml b/applets/quickshare/plasmoid/contents/config/config.qml
index dbe5914da..3818b237e 100644
--- a/applets/quickshare/plasmoid/contents/config/config.qml
+++ b/applets/quickshare/plasmoid/contents/config/config.qml
@@ -1,31 +1,31 @@
 /*
  * Copyright 2014 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
 import QtQuick 2.0
 
 import org.kde.plasma.configuration 2.0
 
 ConfigModel {
     ConfigCategory {
          name: i18nc("@title", "General")
-         icon: "edit-paste"
+         icon: "emblem-shared-symbolic"
          source: "settingsGeneral.qml"
     }
 }
diff --git a/applets/quickshare/plasmoid/contents/ui/settingsGeneral.qml b/applets/quickshare/plasmoid/contents/ui/settingsGeneral.qml
index b65b7c1f1..259fe6b43 100644
--- a/applets/quickshare/plasmoid/contents/ui/settingsGeneral.qml
+++ b/applets/quickshare/plasmoid/contents/ui/settingsGeneral.qml
@@ -1,61 +1,46 @@
 /***************************************************************************
  *   Copyright (C) 2013 by Aleix Pol Gonzalez <aleixpol@blue-systems.com>  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.0 as QtControls
-import QtQuick.Layouts 1.0
+import QtQuick.Controls 2.5
+import org.kde.kirigami 2.5 as Kirigami
 
-ColumnLayout {
+Kirigami.FormLayout {
     id: configRoot
+    anchors.left: parent.left
+    anchors.right: parent.right
+
     property alias cfg_historySize: historySpin.value
     property alias cfg_copyAutomatically: copyAutomatically.checked
 
-    GridLayout {
-        columns: 2
-
-        QtControls.Label {
-            Layout.row: 0
-            Layout.column: 0
-            Layout.alignment: Qt.AlignRight
-            text: i18nc("@label:spinbox", "History size:")
-        }
-        QtControls.SpinBox {
-            id: historySpin
-            Layout.row: 0
-            Layout.column: 1
-            value: 3
-        }
-
-        QtControls.Label {
-            Layout.row: 1
-            Layout.column: 0
-            Layout.alignment: Qt.AlignRight
-            text: i18nc("@option:check", "Copy automatically:")
-        }
-        QtControls.CheckBox {
-            Layout.row: 1
-            Layout.column: 1
-            id: copyAutomatically
-        }
+    SpinBox {
+        id: historySpin
+        Kirigami.FormData.label: i18nc("@label:spinbox", "History size:")
+        value: 3
     }
 
     Item {
-        Layout.fillHeight: true
+        Kirigami.FormData.isSection: false
+    }
+
+    CheckBox {
+        id: copyAutomatically
+        Kirigami.FormData.label: i18nc("@option:check", "Copy automatically:")
     }
 }