#622 - fixed display of builtin icons

src/main/resources/templates/helpers/header.ftl

@@ -120,10 +120,16 @@
     </a>
 </#macro>
 
-<#macro entityIcon entity classes="">
+<#macro entityIcon entity wrapInCircle=true classes="">
     <#if entity.getIconReference()??>
         <#if entity.getIconReference().isBuiltinIcon()>
-            <i class="${entity.getIconReference().getBuiltinIdentifier()} ${classes}"></i>
+            <#if wrapInCircle>
+                <div class="category-circle">
+            </#if>
+                <i class="${entity.getIconReference().getBuiltinIdentifier()} text-default ${classes}"></i>
+            <#if wrapInCircle>
+                </div>
+            </#if>
         <#else>
             <img src="${entity.getIconReference().getImage().getBase64EncodedImage()}" class="${classes}"/>
         </#if>

src/main/resources/templates/templates/templateFunctions.ftl

@@ -53,7 +53,7 @@
 
 <#macro templateHeader template>
     <#if template.getIconReference()??>
-        <@header.entityIcon entity=template classes="template-icon"/>
+        <@header.entityIcon entity=template wrapInCircle=false classes="template-icon"/>
     <#elseif template.getTransferAccount()??>
         <i class="material-icons">swap_horiz</i>
     <#else>