diff --git a/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift b/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift
index 6a45ca19..b0999ffd 100644
--- a/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift
+++ b/OpenHABCore/Sources/OpenHABCore/Util/Endpoint.swift
@@ -183,6 +183,7 @@ public extension Endpoint {
                 if source == "f7" {
                     source = "iconify"
                     set = "f7"
+                    icon = icon.replacingOccurrences(of: "_", with: "-")
                 }
                 if source == "if" || source == "iconify" {
                     queryItems = [URLQueryItem(name: "height", value: "64")]