diff --git a/containments/homescreen/package/contents/ui/AppletsArea.qml b/containments/homescreen/package/contents/ui/AppletsArea.qml
index efbc3c4e..4dc4d704 100644
--- a/containments/homescreen/package/contents/ui/AppletsArea.qml
+++ b/containments/homescreen/package/contents/ui/AppletsArea.qml
@@ -67,6 +67,7 @@ MouseEventListener {
             editOverlay.visible = true;
             var pos = mapToItem(appletsLayout, mouse.x, mouse.y);
             draggingApplet = appletsSpace.layout.childAt(pos.x, pos.y);
+            editOverlay.applet = draggingApplet;
 
             startMouseX = mouse.screenX;
             startMouseY = mouse.screenY;
diff --git a/containments/homescreen/package/contents/ui/EditOverlay.qml b/containments/homescreen/package/contents/ui/EditOverlay.qml
index fae42479..6fad46f6 100644
--- a/containments/homescreen/package/contents/ui/EditOverlay.qml
+++ b/containments/homescreen/package/contents/ui/EditOverlay.qml
@@ -32,6 +32,7 @@ Rectangle {
     id: editOverlay
     anchors.fill: parent
 
+    property Item applet
     color: Qt.rgba(0, 0, 0, 0.8)
     visible: false
     onVisibleChanged: {
@@ -61,6 +62,31 @@ Rectangle {
         anchors.fill: parent
         preventStealing: true
         onClicked: editOverlay.opacity = 0;
+        Row {
+            visible: editOverlay.applet
+            anchors.horizontalCenter: parent.horizontalCenter
+            y: parent.mapFromItem(editOverlay.applet, 0, 0).y + units.gridUnit * 3
+            PlasmaComponents.ToolButton {
+                iconSource: "configure"
+                flat: false
+                onClicked: {
+                    editOverlay.applet.applet.action("configure").trigger();
+                    editOverlay.opacity = 0;
+                }
+            }
+            Item {
+                width: units.gridUnit * 10
+                height: 1
+            }
+            PlasmaComponents.ToolButton {
+                iconSource: "window-close"
+                flat: false
+                onClicked: {
+                    editOverlay.applet.applet.action("remove").trigger();
+                    editOverlay.opacity = 0;
+                }
+            }
+        }
     }
     PlasmaCore.FrameSvgItem {
         id: background
diff --git a/shell/contents/configuration/AppletConfiguration.qml b/shell/contents/configuration/AppletConfiguration.qml
index 7fc74cf5..d95bbf83 100644
--- a/shell/contents/configuration/AppletConfiguration.qml
+++ b/shell/contents/configuration/AppletConfiguration.qml
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.0
+import QtGraphicalEffects 1.0
 import QtQuick.Dialogs 1.1
 import QtQuick.Controls 1.0 as QtControls
 import QtQuick.Layouts 1.0
@@ -42,11 +43,6 @@ Rectangle {
 
     ConfigModel {
         id: globalAppletConfigModel
-        ConfigCategory {
-            name: i18nd("plasma_shell_org.kde.plasma.desktop", "Keyboard shortcuts")
-            icon: "preferences-desktop-keyboard"
-            source: "ConfigurationShortcuts.qml"
-        }
     }
 //END model
 
@@ -363,6 +359,34 @@ Rectangle {
                     shortcut: "Escape"
                 }
             }
+            LinearGradient {
+                width: units.gridUnit/2
+                anchors {
+                    right: parent.left
+                    top: parent.top
+                    bottom: parent.bottom
+                    rightMargin: -1
+                }
+                start: Qt.point(0, 0)
+                end: Qt.point(units.gridUnit/2, 0)
+                gradient: Gradient {
+                    GradientStop {
+                        position: 0.0
+                        color: "transparent"
+                    }
+                    GradientStop {
+                        position: 0.7
+                        color: Qt.rgba(0, 0, 0, 0.15)
+                    }
+                    GradientStop {
+                        position: 1.0
+                        color: Qt.rgba(0, 0, 0, 0.3)
+                    }
+                }
+                MouseArea {
+                    anchors.fill: parent
+                }
+            }
         }
     }
 //END UI components