diff --git a/frontend/src/app/main/ui/ds/controls/utilities/hint_message.cljs b/frontend/src/app/main/ui/ds/controls/utilities/hint_message.cljs
index 04b3aaaaf3..78925688e1 100644
--- a/frontend/src/app/main/ui/ds/controls/utilities/hint_message.cljs
+++ b/frontend/src/app/main/ui/ds/controls/utilities/hint_message.cljs
@@ -13,7 +13,7 @@
 
 (def ^:private schema::hint-message
   [:map
-   [:message :string]
+   [:message [:or fn? :string]]
    [:id :string]
    [:type {:optional true} [:enum "hint" "error" "warning"]]
    [:class {:optional true} :string]])
diff --git a/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs b/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs
index 30476df1c5..440bd7ee23 100644
--- a/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs
+++ b/frontend/src/app/main/ui/ds/tooltip/tooltip.cljs
@@ -172,9 +172,7 @@
    [:id {:optional true} :string]
    [:offset {:optional true} :int]
    [:delay {:optional true} :int]
-   ;; TODO: Review why html element crash schema
-   ;; https://tree.taiga.io/project/penpot/task/12039
-   ;; [:content [:or fn? :string [:fn mf/element?]]]
+   [:content [:or fn? :string]]
    [:placement {:optional true}
     [:maybe [:enum "top" "bottom" "left" "right" "top-right" "bottom-right" "bottom-left" "top-left"]]]])
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
index 8ac990deec..397415718b 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
@@ -104,10 +104,10 @@
                                has-errors
                                (tr "color-row.token-color-row.deleted-token")
                                :else
-                               (mf/html
-                                [:div
-                                 [:span (dm/str (tr "workspace.tokens.token-name") ": ")]
-                                 [:span {:class (stl/css :token-name-tooltip)} color-token]]))]
+                               #(mf/html
+                                 [:div
+                                  [:span (dm/str (tr "workspace.tokens.token-name") ": ")]
+                                  [:span {:class (stl/css :token-name-tooltip)} color-token]]))]
 
     [:div {:class (stl/css :color-info)}
      [:div {:class (stl/css-case :token-color-wrapper true