1 files changed, 6 insertions, 53 deletions
diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml
index 091da2c..75defb6 100644
--- a/modules/notifications/Notification.qml
+++ b/modules/notifications/Notification.qml
@@ -155,59 +155,12 @@ StyledRect {
                 anchors.right: root.hasImage ? image.right : undefined
                 anchors.bottom: root.hasImage ? image.bottom : undefined
 
-                sourceComponent: StyledRect {
-                    radius: Appearance.rounding.full
-                    color: {
-                        if (root.isCritical) return Colours.palette.m3error;
-                        if (root.isLow) return Colours.layer(Colours.palette.m3surfaceContainerHighest, 2);
-                        return Colours.palette.m3secondaryContainer;
-                    }
-                    implicitWidth: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image
-                    implicitHeight: root.hasImage ? Config.notifs.sizes.badge : Config.notifs.sizes.image
-
-                    Loader {
-                        id: icon
-
-                        active: root.hasAppIcon
-                        asynchronous: false
-                        visible: active
-
-                        anchors.centerIn: parent
-
-                        width: Math.round(parent.width * 0.6)
-                        height: Math.round(parent.width * 0.6)
-
-                        sourceComponent: ColouredIcon {
-                            anchors.fill: parent
-                            source: Quickshell.iconPath(root.modelData.appIcon)
-                            colour: {
-                                if (root.isCritical) return Colours.palette.m3onError;
-                                if (root.isLow) return Colours.palette.m3onSurface;
-                                return Colours.palette.m3onSecondaryContainer;
-                            }
-                            layer.enabled: root.modelData.appIcon.endsWith("symbolic")
-                        }
-                    }
-
-                    Loader {
-                        active: !root.hasAppIcon
-                        asynchronous: false
-                        visible: active
-                        anchors.centerIn: parent
-                        anchors.horizontalCenterOffset: -Appearance.font.size.large * 0.02
-                        anchors.verticalCenterOffset: Appearance.font.size.large * 0.02
-
-                        sourceComponent: MaterialIcon {
-                            text: Icons.getNotifIcon(root.modelData.summary, root.modelData.urgency)
-
-                            color: {
-                                if (root.isCritical) return Colours.palette.m3onError;
-                                if (root.isLow) return Colours.palette.m3onSurface;
-                                return Colours.palette.m3onSecondaryContainer;
-                            }
-                            font.pointSize: Appearance.font.size.large
-                        }
-                    }
+                sourceComponent: AppIconBadge {
+                    modelData: root.modelData
+                    hasImage: root.hasImage
+                    hasAppIcon: root.hasAppIcon
+                    isCritical: root.isCritical
+                    isLow: root.isLow
                 }
             }