diff --git a/lib/Form/DisplayFormInWPContent.php b/lib/Form/DisplayFormInWPContent.php
index a4f309c58c..5b9eeffb41 100644
--- a/lib/Form/DisplayFormInWPContent.php
+++ b/lib/Form/DisplayFormInWPContent.php
@@ -146,6 +146,7 @@ class DisplayFormInWPContent {
       'form_type' => $displayType,
       'styles' => $this->formRenderer->renderStyles($formData, '#' . $htmlId, $displayType),
       'html' => $this->formRenderer->renderHTML($formData),
+      'close_button_icon' => $formSettings['close_button'] ?? 'classic',
     ];
 
     // (POST) non ajax success/error variables
diff --git a/lib/Form/PreviewPage.php b/lib/Form/PreviewPage.php
index 69281e74e3..f4acfff9ae 100644
--- a/lib/Form/PreviewPage.php
+++ b/lib/Form/PreviewPage.php
@@ -90,6 +90,7 @@ class PreviewPage {
       'form_id' => $formId,
       'form_success_message' => $formData['settings']['success_message'] ?? null,
       'form_type' => $formDisplayType,
+      'close_button_icon' => $formData['settings']['close_button'] ?? 'classic',
       'styles' => $this->formRenderer->renderStyles($formData, '#' . $htmlId, $formDisplayType),
       'html' => $this->formRenderer->renderHTML($formData),
       'success' => $formDisplayType === FormEntity::DISPLAY_TYPE_OTHERS,
diff --git a/views/form/front_end_form.html b/views/form/front_end_form.html
index cb74018fc0..1d49938a15 100644
--- a/views/form/front_end_form.html
+++ b/views/form/front_end_form.html
@@ -22,7 +22,7 @@
         alt="close"
         width=20
         height=20
-        src='data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjEuMiwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNhcGFfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiCgkgdmlld0JveD0iMCAwIDUwIDUwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA1MCA1MDsiIHhtbDpzcGFjZT0icHJlc2VydmUiPgo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLnN0MHtvcGFjaXR5OjAuNjt9Cgkuc3Qxe2ZpbGw6bm9uZTtzdHJva2U6I0ZGRkZGRjtzdHJva2Utd2lkdGg6MjtzdHJva2UtbGluZWNhcDpyb3VuZDtzdHJva2UtbWl0ZXJsaW1pdDoxMDt9Cjwvc3R5bGU+CjxjaXJjbGUgY2xhc3M9InN0MCIgY3g9IjI1IiBjeT0iMjUiIHI9IjI1Ii8+Cjxwb2x5bGluZSBjbGFzcz0ic3QxIiBwb2ludHM9IjE2LDM0IDI1LDI1IDM0LDE2ICIvPgo8cG9seWxpbmUgY2xhc3M9InN0MSIgcG9pbnRzPSIxNiwxNiAyNSwyNSAzNCwzNCAiLz4KPC9zdmc+Cg=='
+        src='<%= image_url("form_close_icon/" ~ close_button_icon ~ ".svg") %>'
       >
     <% endif %>
     <%= styles | raw %>