diff --git a/src/main/resources/templates/helpers/header.ftl b/src/main/resources/templates/helpers/header.ftl
index f29ce4c2b3c2c89c1a60715f89ec60fde76a268a..7b72f707ffbfea769208d8c7ef284888dd147cbd 100644
--- a/src/main/resources/templates/helpers/header.ftl
+++ b/src/main/resources/templates/helpers/header.ftl
@@ -149,7 +149,7 @@
         <#if entity.getIconReference().isBuiltinIcon()>
             <i class="${entity.getIconReference().getBuiltinIdentifier()} ${classes}"></i>
         <#else>
-            <img src="${entity.getIconReference().getImage().getBase64EncodedImage()}" class="${classes}"/>
+            <img src="<@s.url "/media/getImage/" + entity.getIconReference().getID()/>" class="${classes}"/>
         </#if>
     </#if>
 </#macro>
\ No newline at end of file
diff --git a/src/main/resources/templates/helpers/iconSelect.ftl b/src/main/resources/templates/helpers/iconSelect.ftl
index cf157c5418a7108de7c1988dd811af0d9e75898c..71254b25af419e717a3989a2bb5227ebf911c1b5 100644
--- a/src/main/resources/templates/helpers/iconSelect.ftl
+++ b/src/main/resources/templates/helpers/iconSelect.ftl
@@ -13,7 +13,7 @@
             <div id="${id}" class="valign-wrapper item-icon">
                 <a id="item-icon-preview">
                     <i id="builtin-icon-preview-icon" class="<#if hasBuiltinIcon>${item.getIconReference().getBuiltinIdentifier()}<#else>hidden</#if>"></i>
-                    <img id="item-icon-preview-icon" src="<#if hasImageIcon>${item.getIconReference().getImage().getBase64EncodedImage()}</#if>" class="item-icon-preview <#if hasImageIcon == false>hidden</#if>"/>
+                    <img id="item-icon-preview-icon" src="<#if hasImageIcon><@s.url "/media/getImage/" + item.getIconReference().getID()/></#if>" class="item-icon-preview <#if hasImageIcon == false>hidden</#if>"/>
                     <div id="item-icon-placeholder" class="<#if hasImageIcon || hasBuiltinIcon>hidden</#if>">${locale.getString("account.new.icon.placeholder")}</div>
                 </a>
                 <@header.buttonFlat url='' icon='delete' id='' localizationKey='' classes="no-padding text-default button-remove-icon-from-item" noUrl=true/>