diff --git a/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift b/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift
index 775eebc6..cf63b0b3 100644
--- a/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift
+++ b/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift
@@ -177,6 +177,7 @@ public extension Endpoint {
                 }
                 if source == "material" {
                     source = "iconify"
+                    icon = icon.replacingOccurrences(of: "_", with: "-")
                     icon = "\(set)-\(icon)"
                     set = "ic"
                 }