#622 - use new macro in category circles

src/main/resources/templates/accounts/accounts.ftl

@@ -38,7 +38,7 @@
                                             <i class="fas fa-edit"></i>
                                         </#if>
                                     </td>
-                                    <td><@header.entityIcon entity=account classes="account-icon"/></td>
+                                    <td><@header.entityIcon entity=account classes="account-icon text-default"/></td>
                                     <td>${account.getName()}</td>
                                     <td>
                                         <a href="<@s.url '/accounts/${account.getID()?c}/edit'/>" class="btn-flat no-padding text-default"><i class="material-icons left">edit</i></a>

src/main/resources/templates/categories/categoriesFunctions.ftl

@@ -24,8 +24,8 @@
 
     <div class="category-circle ${classes} <#if settings.getShowCategoriesAsCircles()?? && settings.getShowCategoriesAsCircles() == false>category-square</#if>" style="background-color: ${category.color}" <#if datasetValue>data-value="${category.getID()}"</#if>>
         <span style="color: ${category.getAppropriateTextColor()}">
-            <#if category.getIcon()?has_content>
-                <i class="${category.getIcon()}"></i>
+            <#if category.getIconReference()??>
+                <@header.entityIcon entity=category/>
             <#else>
                 ${categoryName?capitalize[0]}
             </#if>

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

@@ -165,7 +165,7 @@
 <#macro accountIcon account accountName classes="" datasetValue="">
     <div class="category-circle ${classes} category-square <#if account.getIconReference()?? == false>account-square-border</#if>" <#if datasetValue?has_content>data-value="${account.getID()}"</#if>>
         <#if account.getIconReference()??>
-            <@header.entityIcon entity=account classes="account-select-icon"/>
+            <@header.entityIcon entity=account classes="account-select-icon text-blue"/>
         <#else>
             <span class="text-blue">
                 ${accountName?capitalize[0]}

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

@@ -126,7 +126,7 @@
             <#if wrapInCircle>
                 <div class="category-circle">
             </#if>
-                <i class="${entity.getIconReference().getBuiltinIdentifier()} text-default ${classes}"></i>
+                <i class="${entity.getIconReference().getBuiltinIdentifier()} ${classes}"></i>
             <#if wrapInCircle>
                 </div>
             </#if>

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

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