Merge branch 'Plasma/5.4'

applets/notifications/package/contents/ui/NotificationIcon.qml

@@ -78,7 +78,7 @@ Item {
 
             // anchors.fill: parent breaks at small sizes for some reason
             anchors.centerIn: parent
-            width: parent.width - units.smallSpacing
+            width: parent.width - (units.smallSpacing * 2.5 * text.length)
             height: width
 
             horizontalAlignment: Text.AlignHCenter

applets/notifications/package/contents/ui/NotificationItem.qml

@@ -209,6 +209,7 @@ Item {
                     model: notificationItem.actions
 
                     PlasmaComponents.Button {
+                        Layout.maximumWidth: actionsColumn.Layout.maximumWidth
                         text: model.text
                         onClicked: notificationItem.action(model.id)
                     }

applets/notifications/package/contents/ui/main.qml

@@ -60,6 +60,12 @@ MouseEventListener {
 
     Plasmoid.switchWidth: units.gridUnit * 20
     Plasmoid.switchHeight: units.gridUnit * 30
+    Plasmoid.icon: {
+        if (jobs && jobs.count) {
+            return "notification-active"
+        }
+        return totalCount ? "notification-inactive" : "notification-disabled"
+    }
 
     Plasmoid.compactRepresentation: Component {
         NotificationIcon {