diff --git a/applets/notifications/package/contents/ui/NotificationItem.qml b/applets/notifications/package/contents/ui/NotificationItem.qml
--- a/applets/notifications/package/contents/ui/NotificationItem.qml
+++ b/applets/notifications/package/contents/ui/NotificationItem.qml
@@ -111,21 +111,26 @@
 
     spacing: units.smallSpacing
 
-    NotificationHeader {
-        id: notificationHeading
-        Layout.fillWidth: true
+    PlasmaContents.TopArea{
+        bottomInset: thumbnailTopPadding / 2
+        Layout.bottomMargin: thumbnailTopPadding / 2
         Layout.leftMargin: notificationItem.headingLeftPadding
         Layout.rightMargin: notificationItem.headingRightPadding
+        
+        NotificationHeader {
+            id: notificationHeading
+            anchors.fill: parent
 
-        inGroup: notificationItem.inGroup
+            inGroup: notificationItem.inGroup
 
-        notificationType: notificationItem.notificationType
-        jobState: notificationItem.jobState
-        jobDetails: notificationItem.jobDetails
+            notificationType: notificationItem.notificationType
+            jobState: notificationItem.jobState
+            jobDetails: notificationItem.jobDetails
 
-        onConfigureClicked: notificationItem.configureClicked()
-        onDismissClicked: notificationItem.dismissClicked()
-        onCloseClicked: notificationItem.closeClicked()
+            onConfigureClicked: notificationItem.configureClicked()
+            onDismissClicked: notificationItem.dismissClicked()
+            onCloseClicked: notificationItem.closeClicked()
+        }
     }
 
     RowLayout {
diff --git a/applets/notifications/package/contents/ui/NotificationPopup.qml b/applets/notifications/package/contents/ui/NotificationPopup.qml
--- a/applets/notifications/package/contents/ui/NotificationPopup.qml
+++ b/applets/notifications/package/contents/ui/NotificationPopup.qml
@@ -165,7 +165,7 @@
             NotificationItem {
                 id: notificationItem
                 // let the item bleed into the dialog margins so the close button margins cancel out
-                y: closable || dismissable || configurable ? -notificationPopup.margins.top : 0
+                y: closable || dismissable || configurable ? -notificationPopup.margins.top / 2 : 0
                 headingRightPadding: -notificationPopup.margins.right
                 width: parent.width
                 hovered: area.containsMouse
diff --git a/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml b/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
--- a/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
+++ b/applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
@@ -35,11 +35,13 @@
     Layout.preferredHeight: Layout.minimumHeight
     Layout.maximumWidth: Layout.minimumWidth
     Layout.maximumHeight: Layout.minimumHeight
-    spacing: 0 // avoid gap between title and content
+    spacing: toparea.margins.top // compensate -toparea.margins.top of framesvgItem
 
     property alias activeApplet: container.activeApplet
     property alias hiddenLayout: hiddenItemsView.layout
 
+    PlasmaComponents.TopArea {
+        
     RowLayout {
 
         PlasmaExtras.Heading {
@@ -59,53 +61,53 @@
                 } else {
                     return units.smallSpacing;
                 }
-            }
-            Layout.rightMargin: {
-                //Menu mode
-                if (!activeApplet && hiddenItemsView.visible && LayoutMirroring.enabled) {
-                    return units.smallSpacing;
-
-                //applet open, sidebar
-                } else if (activeApplet && hiddenItemsView.visible && LayoutMirroring.enabled) {
-                    return hiddenItemsView.width + units.largeSpacing;
-
-                //applet open, no sidebar
-                } else {
-                    return 0;
+                Layout.rightMargin: {
+                    //Menu mode
+                    if (!activeApplet && hiddenItemsView.visible && LayoutMirroring.enabled) {
+                        return units.smallSpacing;
+
+                    //applet open, sidebar
+                    } else if (activeApplet && hiddenItemsView.visible && LayoutMirroring.enabled) {
+                        return hiddenItemsView.width + units.largeSpacing;
+
+                    //applet open, no sidebar
+                    } else {
+                        return 0;
+                    }
                 }
-            }
 
-            visible: activeApplet
-            text: activeApplet ? activeApplet.title : ""
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    if (activeApplet) {
-                        activeApplet.expanded = false;
-                        dialog.visible = true;
+                visible: activeApplet
+                text: activeApplet ? activeApplet.title : ""
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        if (activeApplet) {
+                            activeApplet.expanded = false;
+                            dialog.visible = true;
+                        }
                     }
                 }
             }
-        }
 
-        PlasmaExtras.Heading {
-            id: noAppletHeading
-            visible: !activeApplet
-            Layout.fillWidth: true
-            level: 1
-            text: i18n("Status and Notifications")
-        }
+            PlasmaExtras.Heading {
+                id: noAppletHeading
+                visible: !activeApplet
+                Layout.fillWidth: true
+                level: 1
+                text: i18n("Status and Notifications")
+            }
 
-        PlasmaComponents.ToolButton {
-            id: pinButton
-            implicitHeight: Math.round(units.gridUnit * 1.25)
-            implicitWidth: implicitHeight
-            checkable: true
-            checked: plasmoid.configuration.pin
-            onToggled: plasmoid.configuration.pin = checked
-            icon.name: "window-pin"
-            PlasmaComponents.ToolTip {
-                text: i18n("Keep Open")
+            PlasmaComponents.ToolButton {
+                id: pinButton
+                implicitHeight: Math.round(units.gridUnit * 1.25)
+                implicitWidth: implicitHeight
+                checkable: true
+                checked: plasmoid.configuration.pin
+                onToggled: plasmoid.configuration.pin = checked
+                icon.name: "window-pin"
+                PlasmaComponents.ToolTip {
+                    text: i18n("Keep Open")
+                }
             }
         }
     }