diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.php
index 4c76ad7795..67d3b9e6bf 100644
--- a/app/Http/Controllers/Report/AccountController.php
+++ b/app/Http/Controllers/Report/AccountController.php
@@ -63,7 +63,7 @@ final class AccountController extends Controller
         } catch (Throwable $e) {
             Log::error(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));
             Log::error($e->getTraceAsString());
-            $result = 'Could not render view.';
+            $result = sprintf('Could not render view: %s', $e->getMessage());
 
             throw new FireflyException($result, 0, $e);
         }
diff --git a/app/Http/Controllers/Report/BillController.php b/app/Http/Controllers/Report/BillController.php
index 03bc1f12f0..9cc102da3c 100644
--- a/app/Http/Controllers/Report/BillController.php
+++ b/app/Http/Controllers/Report/BillController.php
@@ -63,7 +63,7 @@ final class BillController extends Controller
         } catch (Throwable $e) {
             Log::error(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));
             Log::error($e->getTraceAsString());
-            $result = 'Could not render view.';
+            $result = sprintf('Could not render view: %s', $e->getMessage());
 
             throw new FireflyException($result, 0, $e);
         }
diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php
index 7b8e79975b..11d6b70de6 100644
--- a/app/Http/Controllers/Report/CategoryController.php
+++ b/app/Http/Controllers/Report/CategoryController.php
@@ -641,9 +641,11 @@ final class CategoryController extends Controller
     public function topExpenses(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
     {
         $spent   = $this->opsRepository->listExpenses($start, $end, $accounts, $categories);
+        $incomeTopLength = 0;
         $result  = [];
         foreach ($spent as $currency) {
             foreach ($currency['categories'] as $category) {
+                $incomeTopLength++;
                 foreach ($category['transaction_journals'] as $journal) {
                     $result[] = [
                         'description'              => $journal['description'],
@@ -670,7 +672,7 @@ final class CategoryController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = view('reports.category.partials.top-expenses', ['result' => $result])->render();
+            $result = view('reports.category.partials.top-expenses', ['result' => $result, 'incomeTopLength' => $incomeTopLength])->render();
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php
index e55f14fcf8..8a4b7692eb 100644
--- a/app/Http/Controllers/Report/OperationsController.php
+++ b/app/Http/Controllers/Report/OperationsController.php
@@ -75,13 +75,14 @@ final class OperationsController extends Controller
         }
         $report = $this->tasker->getExpenseReport($start, $end, $accounts);
         $type   = 'expense-entry';
+        $incomeTopLength= count($report['accounts']);
 
         try {
-            $result = view('reports.partials.income-expenses', ['report' => $report, 'type' => $type])->render();
+            $result = view('reports.partials.income-expenses', ['report' => $report, 'type' => $type, 'incomeTopLength' => $incomeTopLength])->render();
         } catch (Throwable $e) {
             Log::error(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage()));
             Log::error($e->getTraceAsString());
-            $result = 'Could not render view.';
+            $result = sprintf('Could not render view: %s', $e->getMessage());
 
             throw new FireflyException($result, 0, $e);
         }
@@ -115,7 +116,7 @@ final class OperationsController extends Controller
         } catch (Throwable $e) {
             Log::error(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage()));
             Log::error($e->getTraceAsString());
-            $result = 'Could not render view.';
+            $result = sprintf('Could not render view: %s', $e->getMessage());
 
             throw new FireflyException($result, 0, $e);
         }
@@ -170,7 +171,7 @@ final class OperationsController extends Controller
         } catch (Throwable $e) {
             Log::error(sprintf('Could not render reports.partials.operations: %s', $e->getMessage()));
             Log::error($e->getTraceAsString());
-            $result = 'Could not render view.';
+            $result = sprintf('Could not render view: %s', $e->getMessage());
 
             throw new FireflyException($result, 0, $e);
         }
diff --git a/resources/views/accounts/reconcile/unused-show.blade.php b/resources/views/accounts/reconcile/unused-show.blade.php
index a23a55734f..185ccfdbf2 100644
--- a/resources/views/accounts/reconcile/unused-show.blade.php
+++ b/resources/views/accounts/reconcile/unused-show.blade.php
@@ -66,7 +66,7 @@
                         <tbody>
                         {{--
                         <tr>
-                            <td>{{ 'categories'|_ }}</td>
+                            <td>{{ __('firefly.categories') }}</td>
                             <td>{{ journalCategories(journal)|raw }}</td>
                         </tr>
                         --}}
diff --git a/resources/views/budgets/partials/unused-amount-left.blade.php b/resources/views/budgets/partials/unused-amount-left.blade.php
index 59a8d8914f..d4713448fc 100644
--- a/resources/views/budgets/partials/unused-amount-left.blade.php
+++ b/resources/views/budgets/partials/unused-amount-left.blade.php
@@ -2,21 +2,21 @@
 {% for budgetLimit in budget.budgeted %}
     <span class="left_span" data-currency="{{ budgetLimit.currency_id }}" data-limit="{{ budgetLimit.id }}" data-value="{{ budgetLimit.left }}" class="amount_left">
         {{-- the amount left --}}
-        <span title="{{ 'left_in_budget_limit_overview'|_ }}">{{ format_amount_by_symbol(budgetLimit.left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}</span>
+        <span title="{{ 'left_in_budget_limit_overview'|_ }}">{!! format_amount_by_symbol(budgetLimit.left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}</span>
 
         {{-- if the budget limit is in the past, this is not interesting. --}}
         {{-- if there is nothing left, this is not interesting. --}}
         {% if not budgetLimit.in_past and -1 == bccomp('0',budgetLimit.left) %}
             {% if 0 == budgetLimit.active_days_left %}
-                <span title="{{ trans('firefly.left_in_budget_limit_per_day', {days: 0}) }}">({{ format_amount_by_symbol(budgetLimit.left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+                <span title="{{ trans('firefly.left_in_budget_limit_per_day', {days: 0}) }}">({!! format_amount_by_symbol(budgetLimit.left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
             @else
-                <span title="{{ trans('firefly.left_in_budget_limit_per_day', {days: budgetLimit.active_days_left}) }}">({{ format_amount_by_symbol(budgetLimit.left / budgetLimit.active_days_left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
+                <span title="{{ trans('firefly.left_in_budget_limit_per_day', {days: budgetLimit.active_days_left}) }}">({!! format_amount_by_symbol(budgetLimit.left / budgetLimit.active_days_left, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
             @endif
         @endif
 
         {{-- if there is nothing left, just format 0.00 --}}
         {% if not budgetLimit.in_past and -1 != bccomp('0',budgetLimit.left) %}
-            <span title="{{ 'nothing_left_in_budget'|_ }}">({{ format_amount_by_symbol('0', budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
+            <span title="{{ 'nothing_left_in_budget'|_ }}">({!! format_amount_by_symbol('0', budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
         @endif
 </span><br />
 @endforeach
@@ -35,15 +35,15 @@
             <span class="left_span" data-currency="{{ spentInfo.currency_id }}" data-limit="{{ budgetLimit.id }}"
                   data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
                  <!--the amount left is automatically calculated.  -->
-                {{ format_amount_by_symbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
+                {!! format_amount_by_symbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
                 {% if spentInfo.spent + budgetLimit.amount > 0 %}
                     {% if 0 == activeDaysLeft %}
-                        ({{ format_amount_by_symbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
+                        ({!! format_amount_by_symbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
                     @else
-                        ({{ format_amount_by_symbol((spentInfo.spent + budgetLimit.amount) / activeDaysLeft, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
+                        ({!! format_amount_by_symbol((spentInfo.spent + budgetLimit.amount) / activeDaysLeft, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
                     @endif
                 @else
-                    ({{ format_amount_by_symbol(0, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
+                    ({!! format_amount_by_symbol(0, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
                 @endif
                                                     </span>
             <br/>
@@ -52,7 +52,7 @@
         {% if spentInfo.currency_id == budgetLimit.currency_id and not budgetLimit.in_range and 0.0 == budgetLimit.total_days %}
             <span class="left_span" data-currency="{{ spentInfo.currency_id }}" data-limit="{{ budgetLimit.id }}"
                   data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
-                                            {{ format_amount_by_symbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
+                                            {!! format_amount_by_symbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
                                         </span>
             <span class="text-muted">({{ 'unknown'|_ }})</span>
         @endif
@@ -60,9 +60,9 @@
 
             <span class="left_span" data-currency="{{ spentInfo.currency_id }}" data-limit="{{ budgetLimit.id }}"
                   data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
-                                            {{ format_amount_by_symbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
+                                            {!! format_amount_by_symbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
                                         </span>
-            ({{ format_amount_by_symbol((spentInfo.spent + budgetLimit.amount) / budgetLimit.total_days, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
+            ({!! format_amount_by_symbol((spentInfo.spent + budgetLimit.amount) / budgetLimit.total_days, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
         @endif
 
     @endforeach
@@ -76,17 +76,17 @@
                                             {% if null == budget.spent[budgetLimit.currency_id] %}
                                                 <span class="left_span" data-currency="{{ spentInfo.currency_id }}" data-limit="{{ budgetLimit.id }}"
                                                       data-value="{{ spentInfo.spent + budgetLimit.amount }}" class="amount_left">
-                                                {{ format_amount_by_symbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}
+                                                {!! format_amount_by_symbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}
                                                     {% if budgetLimit.in_range %}
                                                         {% if 0 == activeDaysLeft %}
-                                                            ({{ format_amount_by_symbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+                                                            ({!! format_amount_by_symbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
                                                         @else
-                                                            ({{ format_amount_by_symbol(budgetLimit.amount / activeDaysLeft, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+                                                            ({!! format_amount_by_symbol(budgetLimit.amount / activeDaysLeft, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
                                                         @endif
                                                     @endif
                                                     {% if not budgetLimit.in_range %}
                                                         <!-- For issue #10441, add per day if the budget limit is out of range. -->
-                                                        ({{ format_amount_by_symbol(budgetLimit.amount / budgetLimit.total_days, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
+                                                        ({!! format_amount_by_symbol(budgetLimit.amount / budgetLimit.total_days, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
                                                     @endif
                                             </span>
                                                 <br/>
diff --git a/resources/views/budgets/partials/unused-amount-spent.blade.php b/resources/views/budgets/partials/unused-amount-spent.blade.php
index 8fdf735927..c8d2632000 100644
--- a/resources/views/budgets/partials/unused-amount-spent.blade.php
+++ b/resources/views/budgets/partials/unused-amount-spent.blade.php
@@ -1,10 +1,10 @@
 {{-- this is spent in budget limits: --}}
 {% for budgetLimit in budget.budgeted %}
-    <span title="{{ 'spent_this_period'|_ }}">{{ format_amount_by_symbol(budgetLimit.spent, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}</span>
+    <span title="{{ 'spent_this_period'|_ }}">{!! format_amount_by_symbol(budgetLimit.spent, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}</span>
     {% if 0 == budgetLimit.active_days_passed %}
-        <span title="{{ trans('firefly.spent_this_period_per_day', {days: 0}) }}">({{ format_amount_by_symbol(budgetLimit.spent, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
+        <span title="{{ trans('firefly.spent_this_period_per_day', {days: 0}) }}">({!! format_amount_by_symbol(budgetLimit.spent, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
     @else
-        <span title="{{ trans('firefly.spent_this_period_per_day', {days: budgetLimit.active_days_passed}) }}">({{ format_amount_by_symbol(budgetLimit.spent / budgetLimit.active_days_passed, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
+        <span title="{{ trans('firefly.spent_this_period_per_day', {days: budgetLimit.active_days_passed}) }}">({!! format_amount_by_symbol(budgetLimit.spent / budgetLimit.active_days_passed, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})</span>
     @endif
 <br />
 @endforeach
@@ -12,11 +12,11 @@
 {{-- this is spent NOT in budget limits: --}}
 {% for spent in budget.spent %}
     {% if 0 != bccomp('0', spent.spent_outside)  %}
-        <span title="{{ 'spent_in_budget_limit_outside_period'|_ }}">{{ format_amount_by_symbol(spent.spent_outside, spent.currency_symbol, spent.currency_decimal_places) }}</span>
+        <span title="{{ 'spent_in_budget_limit_outside_period'|_ }}">{!! format_amount_by_symbol(spent.spent_outside, spent.currency_symbol, spent.currency_decimal_places) }}</span>
         {% if 0 == activeDaysPassed %}
-            <span title="{{ trans('firefly.spent_in_budget_limit_outside_period_per_day', {days: 0}) }}">({{ format_amount_by_symbol(spent.spent_outside, spent.currency_symbol, spent.currency_decimal_places) }})</span>
+            <span title="{{ trans('firefly.spent_in_budget_limit_outside_period_per_day', {days: 0}) }}">({!! format_amount_by_symbol(spent.spent_outside, spent.currency_symbol, spent.currency_decimal_places) }})</span>
         @else
-            <span title="{{ trans('firefly.spent_in_budget_limit_outside_period_per_day', {days: activeDaysPassed}) }}">({{ format_amount_by_symbol(spent.spent_outside / activeDaysPassed, spent.currency_symbol, spent.currency_decimal_places) }})</span>
+            <span title="{{ trans('firefly.spent_in_budget_limit_outside_period_per_day', {days: activeDaysPassed}) }}">({!! format_amount_by_symbol(spent.spent_outside / activeDaysPassed, spent.currency_symbol, spent.currency_decimal_places) }})</span>
             @endif
         <br />
     @endif
@@ -26,17 +26,17 @@
 
 
 {% for spentInfo in budget.spent %}
-    {{ format_amount_by_symbol(spentInfo.spent, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
+    {!! format_amount_by_symbol(spentInfo.spent, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
     {% if 0 == activeDaysPassed %}
-        ({{ format_amount_by_symbol(spentInfo.spent, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
+        ({!! format_amount_by_symbol(spentInfo.spent, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
     @else
-        ({{ format_amount_by_symbol(spentInfo.spent / activeDaysPassed, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
+        ({!! format_amount_by_symbol(spentInfo.spent / activeDaysPassed, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }})
     @endif
     <br/>
 @endforeach
 {% for budgetLimit in budget.budgeted %}
     {% if null == budget.spent[budgetLimit.currency_id] %}
-        {{ format_amount_by_symbol(0, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}<br/>
+        {!! format_amount_by_symbol(0, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}<br/>
     @endif
 @endforeach
 --}}
diff --git a/resources/views/components/generic/amount.blade.php b/resources/views/components/generic/amount.blade.php
index 44fc0daad8..bf888318c3 100644
--- a/resources/views/components/generic/amount.blade.php
+++ b/resources/views/components/generic/amount.blade.php
@@ -104,12 +104,12 @@
 
 {% elseif transaction.transaction_type_type == 'Reconciliation' %}
 @else
-  {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+  {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
   {% if null != transaction.foreign_amount %}
-      ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+      ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
   @endif
   {% if convertToPrimary and null != transaction.pc_amount %}
-      ({{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
+      ({!! format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
   @endif
 @endif
     </span>
diff --git a/resources/views/components/lists/subscriptions.blade.php b/resources/views/components/lists/subscriptions.blade.php
index 65080ea62c..e5cf0c0c31 100644
--- a/resources/views/components/lists/subscriptions.blade.php
+++ b/resources/views/components/lists/subscriptions.blade.php
@@ -58,7 +58,7 @@
                     ~ {!! format_amount_by_symbol(($entry['amount_max'] + $entry['amount_min'])/2, $entry['currency_symbol'], $entry['currency_decimal_places'])  !!}
 
                     @if('0' !== $entry['pc_amount_max'] && null !== $entry['pc_amount_max'])
-                        (~ {{ format_amount_by_symbol(($entry['pc_amount_max'] + $entry['pc_amount_min'])/2, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                        (~ {!! format_amount_by_symbol(($entry['pc_amount_max'] + $entry['pc_amount_min'])/2, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                     @endif
                 </span>
         </td>
diff --git a/resources/views/json/piggy-banks-old.blade.php b/resources/views/json/piggy-banks-old.blade.php
index 6877666b17..a1680681ec 100644
--- a/resources/views/json/piggy-banks-old.blade.php
+++ b/resources/views/json/piggy-banks-old.blade.php
@@ -10,20 +10,20 @@
                 <div class="progress-bar width-{{ entry.percentage|round }}" role="progressbar" aria-valuenow="{{ entry.percentage }}" aria-valuemin="0" aria-valuemax="100">
                     {% if entry.percentage >=20 %}
                         {% if convertToPrimary and 0 != avg.pc_amount %}
-                            {{ format_amount_by_symbol(entry.pc_amount, entry.primary_currency_symbol, entry.primary_currency_decimal_places, false) }}
-                            ({{ format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places, false) }})
+                            {!! format_amount_by_symbol(entry.pc_amount, entry.primary_currency_symbol, entry.primary_currency_decimal_places, false) }}
+                            ({!! format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places, false) }})
                         @else
-                            {{ format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places, false) }}
+                            {!! format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places, false) }}
                         @endif
                     @endif
                 </div>
                 {% if entry.percentage < 20 %}
                     &nbsp;
                     {% if convertToPrimary and 0 != avg.pc_amount %}
-                        {{ format_amount_by_symbol(entry.pc_amount, entry.primary_currency_symbol, entry.primary_currency_decimal_places, false) }}
-                        ({{ format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places, false) }})
+                        {!! format_amount_by_symbol(entry.pc_amount, entry.primary_currency_symbol, entry.primary_currency_decimal_places, false) }}
+                        ({!! format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places, false) }})
                     @else
-                        {{ format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places, false) }}
+                        {!! format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places, false) }}
                     @endif
                 @endif
             </div>
diff --git a/resources/views/json/piggy-banks.blade.php b/resources/views/json/piggy-banks.blade.php
index 53cbe28953..33e44e2fcf 100644
--- a/resources/views/json/piggy-banks.blade.php
+++ b/resources/views/json/piggy-banks.blade.php
@@ -10,22 +10,22 @@
             <div class="progress-bar progress-bar-striped w-{{ round($entry['percentage']) }}" role="progressbar" aria-valuenow="{{ $entry['percentage'] }}" aria-valuemin="0" aria-valuemax="100">
                 @if($entry['percentage'] > 20)
                     @if($convertToPrimary && 0 !== $avg['pc_amount'])
-                         {{ format_amount_by_symbol($entry['pc_amount'], $entry['primary_currency_symbol'], $entry['primary_currency_decimal_places'], false) }}
-                        ({{ format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) }})
+                         {!! format_amount_by_symbol($entry['pc_amount'], $entry['primary_currency_symbol'], $entry['primary_currency_decimal_places'], false) }}
+                        ({!! format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) }})
                     @endif
                     @if(!$convertToPrimary)
-                        {{ format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) }}
+                        {!! format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) }}
                     @endif
                 @endif
             </div>
             @if($entry['percentage'] <= 20)
             &nbsp;
                 @if($convertToPrimary && 0 !== $avg['pc_amount'])
-                    {{ format_amount_by_symbol($entry['pc_amount'], $entry['primary_currency_symbol'], $entry['primary_currency_decimal_places'], false) }}
-                    ({{ format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) }})
+                    {!! format_amount_by_symbol($entry['pc_amount'], $entry['primary_currency_symbol'], $entry['primary_currency_decimal_places'], false) }}
+                    ({!! format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) }})
                 @endif
                 @if(!$convertToPrimary)
-                    {{ format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) }}
+                    {!! format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places'], false) }}
                 @endif
             @endif
         </div>
diff --git a/resources/views/list/accounts.blade.php b/resources/views/list/accounts.blade.php
index 1b2946bf6e..3dca806a34 100644
--- a/resources/views/list/accounts.blade.php
+++ b/resources/views/list/accounts.blade.php
@@ -62,7 +62,7 @@
             <td>{{ trans('firefly.liability_direction_'~account.liability_direction~'_short')  }}</td>
             <td>{{ account.interest }}% ({{ account.interestPeriod|lower }})</td>
             @endif
-            <td class="hidden-sm hidden-xs">{{ account.iban }}{% if account.iban == '' %}{{ accountGetMetaField(account, 'account_number') }}@endif</td>
+            <td class="hidden-sm hidden-xs">{{ $account['iban'] }}{% if $account['iban'] == '' %}{{ accountGetMetaField(account, 'account_number') }}@endif</td>
             {% if objectType != 'liabilities' %}
             <td class="text-end">
                 <span class="mr-2">
@@ -70,11 +70,11 @@
                         <span title="{{ key }}">
                         {% if 'balance' == key %}
                             {% if not convertToPrimary %}
-                                {{ format_amount_by_symbol(balance, account.currency.symbol, account.currency.decimal_places)  }}
+                                {!! format_amount_by_symbol(balance, account.currency.symbol, account.currency.decimal_places)  }}
                             @endif
                         {% elseif 'pc_balance' == key %}
                             {% if convertToPrimary %}
-                                {{ format_amount_by_symbol(balance, $primaryCurrency->symbol, $primaryCurrency->decimal_places)  }}
+                                {!! format_amount_by_symbol(balance, $primaryCurrency->symbol, $primaryCurrency->decimal_places)  }}
                             @endif
                         @else
                             ({{ formatAmountByCode(balance, key)  }})
@@ -88,7 +88,7 @@
             <td class="text-end">
                 {% if '-' != account.current_debt %}
                     <span class="text-info money-transfer">
-                        {{ format_amount_by_symbol(account.current_debt, account.currency.symbol, account.currency.decimal_places, false) }}
+                        {!! format_amount_by_symbol(account.current_debt, account.currency.symbol, account.currency.decimal_places, false) }}
                     </span>
                 @endif
             </td>
@@ -119,11 +119,11 @@
                         <span title="{{ key }}">
                               {% if 'balance' == key %}
                                   {% if not convertToPrimary %}
-                                      {{ format_amount_by_symbol(balance, account.currency.symbol, account.currency.decimal_places)  }}
+                                      {!! format_amount_by_symbol(balance, account.currency.symbol, account.currency.decimal_places)  }}
                                   @endif
                               {% elseif 'pc_balance' == key %}
                                   {% if convertToPrimary %}
-                                      {{ format_amount_by_symbol(balance, $primaryCurrency->symbol, $primaryCurrency->decimal_places)  }}
+                                      {!! format_amount_by_symbol(balance, $primaryCurrency->symbol, $primaryCurrency->decimal_places)  }}
                                   @endif
                               @else
                                   ({{ formatAmountByCode(balance, key)  }})
diff --git a/resources/views/list/ale.blade.php b/resources/views/list/ale.blade.php
index 8bf8914cd4..627885babb 100644
--- a/resources/views/list/ale.blade.php
+++ b/resources/views/list/ale.blade.php
@@ -28,14 +28,14 @@
                 @endif
 
                 {% if 'update_amount' == logEntry.action %}
-                    {{ format_amount_by_symbol(logEntry.before.amount, logEntry.before.currency_symbol, logEntry.before.decimal_places, true) }}
+                    {!! format_amount_by_symbol(logEntry.before.amount, logEntry.before.currency_symbol, logEntry.before.decimal_places, true) }}
                     &rarr;
-                    {{ format_amount_by_symbol(logEntry.after.amount, logEntry.after.currency_symbol, logEntry.after.decimal_places, true) }}
+                    {!! format_amount_by_symbol(logEntry.after.amount, logEntry.after.currency_symbol, logEntry.after.decimal_places, true) }}
                 @endif
                 {% if 'update_foreign_amount' == logEntry.action %}
-                    {{ format_amount_by_symbol(logEntry.before.amount, logEntry.before.currency_symbol, logEntry.before.decimal_places, true) }}
+                    {!! format_amount_by_symbol(logEntry.before.amount, logEntry.before.currency_symbol, logEntry.before.decimal_places, true) }}
                     &rarr;
-                    {{ format_amount_by_symbol(logEntry.after.amount, logEntry.after.currency_symbol, logEntry.after.decimal_places, true) }}
+                    {!! format_amount_by_symbol(logEntry.after.amount, logEntry.after.currency_symbol, logEntry.after.decimal_places, true) }}
                 @endif
 
 
diff --git a/resources/views/list/bills.blade.php b/resources/views/list/bills.blade.php
index de45b64d8a..440dba0c78 100644
--- a/resources/views/list/bills.blade.php
+++ b/resources/views/list/bills.blade.php
@@ -63,11 +63,11 @@
                         @endif
                     </td>
                     <td class="text-end">
-                <span class="mr-2" title="{{ format_amount_by_symbol(entry.amount_min, entry.currency_symbol, entry.currency_decimal_places, false)|escape }} -- {{ format_amount_by_symbol(entry.amount_max, entry.currency_symbol, entry.currency_decimal_places, false)|escape }}">
-                    ~ {{ format_amount_by_symbol((entry.amount_max + entry.amount_min)/2, entry.currency_symbol, entry.currency_decimal_places) }}
+                <span class="mr-2" title="{!! format_amount_by_symbol(entry.amount_min, entry.currency_symbol, entry.currency_decimal_places, false)|escape }} -- {!! format_amount_by_symbol(entry.amount_max, entry.currency_symbol, entry.currency_decimal_places, false)|escape }}">
+                    ~ {!! format_amount_by_symbol((entry.amount_max + entry.amount_min)/2, entry.currency_symbol, entry.currency_decimal_places) }}
 
                     {% if '0' != entry.pc_amount_max and null != entry.pc_amount_max %}
-                        (~ {{ format_amount_by_symbol((entry.pc_amount_max + entry.pc_amount_min)/2, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                        (~ {!! format_amount_by_symbol((entry.pc_amount_max + entry.pc_amount_min)/2, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                     @endif
                 </span>
                     </td>
@@ -180,7 +180,7 @@
                             <small>{{ __('firefly.sum') }} ({{ sum.currency_name }}) ({{ 'active_exp_bills_only'|_ }})</small>
                         </td>
                         <td class="text-end"> <!-- amount -->
-                            {{ format_amount_by_symbol(sum.avg, sum.currency_symbol, sum.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(sum.avg, sum.currency_symbol, sum.currency_decimal_places) }}
                         </td>
                         <td>&nbsp;</td> <!-- paid in period -->
                         <td class="hidden-sm hidden-xs">&nbsp;</td> <!-- next expected match -->
@@ -195,7 +195,7 @@
                             <small>{{ __('firefly.sum') }} ({{ sum.currency_name }}) ({{ 'left_to_pay_active_bills'|_ }})</small>
                         </td>
                         <td class="text-end"> <!-- amount -->
-                            {{ format_amount_by_symbol(sum.total_left_to_pay, sum.currency_symbol, sum.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(sum.total_left_to_pay, sum.currency_symbol, sum.currency_decimal_places) }}
                         </td>
                         <td>&nbsp;</td> <!-- paid in period -->
                         <td class="hidden-sm hidden-xs">&nbsp;</td> <!-- next expected match -->
@@ -211,7 +211,7 @@
                                 ({{ 'active_bills_only'|_ }})</small>
                         </td>
                         <td class="text-end"> <!-- amount -->
-                            {{ format_amount_by_symbol(sum.per_period, sum.currency_symbol, sum.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(sum.per_period, sum.currency_symbol, sum.currency_decimal_places) }}
                         </td>
                         <td>&nbsp;</td> <!-- paid in period -->
                         <td class="hidden-sm hidden-xs">&nbsp;</td> <!-- next expected match -->
@@ -236,7 +236,7 @@
                         <small>{{ __('firefly.sum') }} ({{ sum.currency_name }}) ({{ 'active_exp_bills_only_total'|_ }})</small>
                     </td>
                     <td class="text-end"> <!-- amount -->
-                        {{ format_amount_by_symbol(sum.avg, sum.currency_symbol, sum.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(sum.avg, sum.currency_symbol, sum.currency_decimal_places) }}
                     </td>
                     <td>&nbsp;</td> <!-- paid in period -->
                     <td class="hidden-sm hidden-xs">&nbsp;</td> <!-- next expected match -->
@@ -252,7 +252,7 @@
                             ({{ 'active_bills_only_total'|_ }})</small>
                     </td>
                     <td class="text-end"> <!-- amount -->
-                        {{ format_amount_by_symbol(sum.per_period, sum.currency_symbol, sum.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(sum.per_period, sum.currency_symbol, sum.currency_decimal_places) }}
                     </td>
                     <td>&nbsp;</td> <!-- paid in period -->
                     <td class="hidden-sm hidden-xs">&nbsp;</td> <!-- next expected match -->
diff --git a/resources/views/list/categories.blade.php b/resources/views/list/categories.blade.php
index 27ce37487c..ca3a14e16a 100644
--- a/resources/views/list/categories.blade.php
+++ b/resources/views/list/categories.blade.php
@@ -15,7 +15,7 @@
         <td><a href="{{ route('categories.no-category') }}"><em>{{ 'without_category'|_ }}</em></a></td>
         <td class="hidden-sm hidden-xs">&nbsp;</td>
     </tr>
-    {% for category in categories %}
+    @foreach($categories as $category)
         <tr>
             <td>
                 <div class="btn-group btn-group-sm">
diff --git a/resources/views/list/groups-tiny.blade.php b/resources/views/list/groups-tiny.blade.php
index 1323a5982b..71991205b9 100644
--- a/resources/views/list/groups-tiny.blade.php
+++ b/resources/views/list/groups-tiny.blade.php
@@ -8,79 +8,79 @@
 
             <span class="text-end small">
           {% if transaction.transaction_type_type == 'Deposit' %}
-              {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+              {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
               {% if null != transaction.foreign_amount %}
-                  ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                  ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
               @endif
               {% if convertToPrimary and null != transaction.pc_amount %}
-                  ({{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
+                  ({!! format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
               @endif
 
           {% elseif transaction.transaction_type_type == 'Transfer' %}
               <span class="text-info money-transfer">
                   {{--  transfer away:  --}}
                   {% if transaction.source_account_id == account.id %}
-                      {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
+                      {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
                       {% if null != transaction.foreign_amount %}
-                          ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
+                          ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                       @endif
                       {% if convertToPrimary and null != transaction.pc_amount %}
-                          ({{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
+                          ({!! format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
                       @endif
                   @else
-                      {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
+                      {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
                       {% if null != transaction.foreign_amount %}
-                          ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
+                          ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                       @endif
                       {% if convertToPrimary and null != transaction.pc_amount %}
-                          ({{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
+                          ({!! format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
                       @endif
                   @endif
                   {{--  transfer to --}}
             </span>
           {% elseif transaction.transaction_type_type == 'Opening balance' %}
               {% if transaction.source_account_type == 'Initial balance account' %}
-                  {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                  {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                   {% if null != transaction.foreign_amount %}
-                      ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                      ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                   @endif
                   {% if convertToPrimary and null != transaction.pc_amount %}
-                      ({{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
+                      ({!! format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
                   @endif
               @else
-                  {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                  {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                   {% if null != transaction.foreign_amount %}
-                      ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                      ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                   @endif
                   {% if convertToPrimary and null != transaction.pc_amount %}
-                      ({{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
+                      ({!! format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
                   @endif
               @endif
           {% elseif transaction.transaction_type_type == 'Reconciliation' %}
               {% if transaction.source_account_type == 'Reconciliation account' %}
-                  {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                  {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                   {% if null != transaction.foreign_amount %}
-                      ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                      ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                   @endif
                   {% if convertToPrimary and null != transaction.pc_amount %}
-                      ({{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
+                      ({!! format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
                   @endif
               @else
-                  {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                  {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                   {% if null != transaction.foreign_amount %}
-                      ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                      ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                   @endif
                   {% if convertToPrimary and null != transaction.pc_amount %}
-                      ({{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
+                      ({!! format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
                   @endif
               @endif
           @else
-              {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+              {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
               {% if null != transaction.foreign_amount %}
-                  ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                  ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
               @endif
               {% if convertToPrimary and null != transaction.pc_amount %}
-                  ({{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
+                  ({!! format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, foreign_currency_.decimal_places) }})
               @endif
           @endif
                 </span>
diff --git a/resources/views/list/groups.blade.php b/resources/views/list/groups.blade.php
index 0842032fea..36230c8ccb 100644
--- a/resources/views/list/groups.blade.php
+++ b/resources/views/list/groups.blade.php
@@ -62,24 +62,24 @@
                 <td colspan="1" class="text-right top-light-border">
                     {% for sum in group.sums %}
                         {% if group.transaction_type == 'Deposit' %}
-                            {{ format_amount_by_symbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places) }}
                             {% if convertToPrimary and 0 != sum.pc_amount %}
-                                (~ {{ format_amount_by_symbol(sum.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                (~ {!! format_amount_by_symbol(sum.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                             @endif
                             {% if loop.index != group.sums|length %},@endif
 
                         {% elseif group.transaction_type == 'Transfer' %}
                             <span class="text-info money-transfer">
-                            {{ format_amount_by_symbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places, false) }}
+                            {!! format_amount_by_symbol(sum.amount*-1, sum.currency_symbol, sum.currency_decimal_places, false) }}
                                 {% if convertToPrimary and 0 != sum.pc_amount %}
-                                    (~ {{ format_amount_by_symbol(sum.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                    (~ {!! format_amount_by_symbol(sum.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                                 @endif
                                 {% if loop.index != group.sums|length %},@endif
                             </span>
                         @else
-                            {{ format_amount_by_symbol(sum.amount, sum.currency_symbol, sum.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(sum.amount, sum.currency_symbol, sum.currency_decimal_places) }}
                             {% if convertToPrimary and 0 != sum.pc_amount %}
-                                (~ {{ format_amount_by_symbol(sum.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                (~ {!! format_amount_by_symbol(sum.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                             @endif
                             {% if loop.index != group.sums|length %},@endif
                         @endif
@@ -167,94 +167,94 @@
                     {{--  deposit --}}
                     {% if transaction.transaction_type_type == 'Deposit' %}
                         {{-- amount of deposit --}}
-                        {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                         {{-- foreign amount of deposit --}}
                         {% if null != transaction.foreign_amount %}
-                            ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                            ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                         @endif
                         {{-- primary currency amount of deposit --}}
                         {% if convertToPrimary and 0 != transaction.pc_amount %}
-                            (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                            (~ {!! format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                         @endif
                         {{-- transfer --}}
                     {% elseif transaction.transaction_type_type == 'Transfer' %}
                         <span class="text-info money-transfer">
                             {{-- amount of transfer --}}
                             {% if transaction.source_account_id == account.id %}
-                                {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
+                                {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
                             @endif
                             {% if transaction.source_account_id != account.id %}
-                                {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
+                                {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
                             @endif
 
                             {{-- foreign amount of transfer --}}
                             {% if null != transaction.foreign_amount and transaction.source_account_id == account.id %}
-                                ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
+                                ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                             @endif
                             {% if null != transaction.foreign_amount and transaction.source_account_id != account.id %}
-                                ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
+                                ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                             @endif
 
                             {{-- primary currency amount of transfer --}}
                             {% if convertToPrimary and 0 != transaction.pc_amount %}
-                                (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                (~ {!! format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                             @endif
                             </span>
                         {{-- opening balance --}}
                     {% elseif transaction.transaction_type_type == 'Opening balance' %}
                         {% if transaction.source_account_type == 'Initial balance account' %}
-                            {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                             {% if null != transaction.foreign_amount %}
-                                ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                                ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             @endif
                             {% if convertToPrimary and 0 != transaction.pc_amount %}
-                                (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                (~ {!! format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                             @endif
                         @else
-                            {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                             {% if null != transaction.foreign_amount %}
-                                ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                                ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             @endif
                             {% if convertToPrimary and 0 != transaction.pc_amount %}
-                                (~ {{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                (~ {!! format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                             @endif
                         @endif
                         {{-- reconciliation --}}
                     {% elseif transaction.transaction_type_type == 'Reconciliation' %}
                         {% if transaction.source_account_type == 'Reconciliation account' %}
-                            {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                             {% if null != transaction.foreign_amount %}
-                                ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                                ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             @endif
                             {% if convertToPrimary and 0 != transaction.pc_amount %}
-                                (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                (~ {!! format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                             @endif
                         @else
-                            {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                             {% if null != transaction.foreign_amount %}
-                                ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                                ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             @endif
                             {% if convertToPrimary and 0 != transaction.pc_amount %}
-                                (~ {{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                (~ {!! format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                             @endif
                         @endif
                         {{-- liability credit --}}
                     {% elseif transaction.transaction_type_type == 'Liability credit' %}
                         {% if transaction.source_account_type == 'Liability credit' %}
-                            {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                             {% if null != transaction.foreign_amount %}
-                                ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                                ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             @endif
                             {% if convertToPrimary and 0 != transaction.pc_amount %}
-                                (~ {{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                (~ {!! format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                             @endif
                         @else
-                            {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                             {% if null != transaction.foreign_amount %}
-                                ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                                ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                             @endif
                             {% if convertToPrimary and 0 != transaction.pc_amount %}
-                                (~ {{ format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                (~ {!! format_amount_by_symbol(transaction.pc_amount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                             @endif
                         @endif
 
@@ -262,15 +262,15 @@
                         {{-- THE REST --}}
                     @else
                         {{-- amount of withdrawal --}}
-                        {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
 
                         {{-- foreign amount of withdrawal --}}
                         {% if null != transaction.foreign_amount %}
-                            ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                            ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                         @endif
                         {{-- primary currency amount of withdrawal, if not in foreign currency --}}
                         {% if convertToPrimary and 0 != transaction.pc_amount and $primaryCurrency->id != transaction.foreign_currency_id %}
-                            (~ {{ format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                            (~ {!! format_amount_by_symbol(transaction.pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                         @endif
                     @endif
                 </td>
@@ -280,12 +280,12 @@
                     {% if (null == transaction.balance_dirty or false == transaction.balance_dirty) and null != transaction.destination_balance_after and null != transaction.source_balance_after %}
                         {% if transaction.transaction_type_type == 'Deposit' %}
                             {% if transaction.source_account_id == account.id %}
-                                <span title="Deposit, source">{{ format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                <span title="Deposit, source">{!! format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                             @else
                                 {% if transaction.source_account_type == 'Revenue account' %}
-                                    <span title="Deposit from revenue">{{ format_amount_by_symbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                    <span title="Deposit from revenue">{!! format_amount_by_symbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                                 @else
-                                    <span title="Deposit from liab">{{ format_amount_by_symbol(transaction.destination_balance_after, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}</span>
+                                    <span title="Deposit from liab">{!! format_amount_by_symbol(transaction.destination_balance_after, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}</span>
                                 @endif
                                 {{-- if this is a deposit from revenue account, use the destination account currency? For #12043 and #12169 --}}
                                 {{-- otherwise, keep at source account --}}
@@ -298,43 +298,43 @@
                             {% if 'Loan' == transaction.destination_account_type or 'Mortgage' == transaction.destination_account_type or 'Debt' == transaction.destination_account_type %}
                                 {% if currency.id == transaction.currency_id %}
                                     {% if account.id == transaction.source_account_id %}
-                                        <span title="Withdrawal, liab, source">{{ format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                        <span title="Withdrawal, liab, source">{!! format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                                     {% elseif account.id == transaction.destination_account_id %}
-                                        <span title="Withdrawal, liab, dest">{{ format_amount_by_symbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                        <span title="Withdrawal, liab, dest">{!! format_amount_by_symbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                                     @else
                                         -
                                     @endif
                                 @endif
                                 {% if currency.id == transaction.foreign_currency_id and null != transaction.destination_balance_after and null != transaction.destination_balance_after %}
-                                    <span title="Withdrawal, liab, dest 2">{{ format_amount_by_symbol(transaction.destination_balance_after, transaction.foreign_currency_symbol ?? transaction.currency_symbol, transaction.foreign_currency_decimal_places ?? transaction.currency_decimal_places) }}</span>
+                                    <span title="Withdrawal, liab, dest 2">{!! format_amount_by_symbol(transaction.destination_balance_after, transaction.foreign_currency_symbol ?? transaction.currency_symbol, transaction.foreign_currency_decimal_places ?? transaction.currency_decimal_places) }}</span>
                                 @endif
                             {{-- withdrawal into an expense account --}}
                             @else
                                 {% if account.id == transaction.source_account_id %}
-                                    <span title="Withdrawal, source">{{ format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                    <span title="Withdrawal, source">{!! format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                                 {% elseif account.id == transaction.destination_account_id %}
-                                    <span title="Withdrawal, dest">{{ format_amount_by_symbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                    <span title="Withdrawal, dest">{!! format_amount_by_symbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                                 @else
                                     -
                                 @endif
                             @endif
                         {% elseif transaction.transaction_type_type == 'Opening balance' %}
                             {% if account.id == transaction.source_account_id %}
-                                <span title="Opening balance, src">{{ format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                <span title="Opening balance, src">{!! format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                             {% elseif account.id == transaction.destination_account_id %}
-                                <span title="Opening balance, dest">{{ format_amount_by_symbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                <span title="Opening balance, dest">{!! format_amount_by_symbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                             @else
                                 -
                             @endif
                         {% elseif transaction.transaction_type_type == 'Transfer' %}
                             {% if account.id == transaction.source_account_id %}
-                                <span title="Transfer, source">{{ format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                <span title="Transfer, source">{!! format_amount_by_symbol(transaction.source_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                             @else
                                 {% if null == transaction.foreign_currency_id %}
-                                    <span title="Transfer, dest, normal currency">{{ format_amount_by_symbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
+                                    <span title="Transfer, dest, normal currency">{!! format_amount_by_symbol(transaction.destination_balance_after, transaction.currency_symbol, transaction.currency_decimal_places) }}</span>
                                 @endif
                                 {% if null != transaction.foreign_currency_id %}
-                                    <span title="Transfer, dest, foreign currency">{{ format_amount_by_symbol(transaction.destination_balance_after, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}</span>
+                                    <span title="Transfer, dest, foreign currency">{!! format_amount_by_symbol(transaction.destination_balance_after, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }}</span>
                                 @endif
                             @endif
                         @else
diff --git a/resources/views/list/periods.blade.php b/resources/views/list/periods.blade.php
index b5699365e3..5f7ff197ad 100644
--- a/resources/views/list/periods.blade.php
+++ b/resources/views/list/periods.blade.php
@@ -18,7 +18,7 @@
                             <td class="third">{{ __('firefly.spent') }}</td>
                             <td class="text-end">
                                 <span title="{{ entry.count }}">
-                                    {{ format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}
+                                    {!! format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}
                                 </span>
                             </td>
                         </tr>
@@ -28,13 +28,13 @@
                 {% for entry in period.earned %}
                     {% if entry.amount != 0 %}
                         <tr>
-                            <td class="third">{{ 'earned'|_ }}</td>
+                            <td class="third">{{ __('firefly.earned') }}</td>
                             <td class="text-end">
                                 <span title="{{ entry.count }}">
                                     {% if entry.amount < 0 %}
-                                        {{ format_amount_by_symbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}
+                                        {!! format_amount_by_symbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}
                                     @else
-                                        {{ format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}
+                                        {!! format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}
                                     @endif
                                 </span>
                             </td>
@@ -48,7 +48,7 @@
                             <td class="third">{{ 'transferred'|_ }}</td>
                             <td class="text-end">
                                 <span title="{{ entry.count }}">
-                                    {{ format_amount_by_symbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}
+                                    {!! format_amount_by_symbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}
                                 </span>
                             </td>
                         </tr>
@@ -62,9 +62,9 @@
                             <td class="text-end">
                                 <span title="{{ entry.count }}">
                                     {% if entry.amount < 0 %}
-                                        {{ format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}
+                                        {!! format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}
                                     @else
-                                        {{ format_amount_by_symbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}
+                                        {!! format_amount_by_symbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}
                                     @endif
                                 </span>
                             </td>
@@ -79,9 +79,9 @@
                             <td class="text-end">
                                 <span title="{{ entry.count }}">
                                     {% if entry.amount < 0 %}
-                                        {{ format_amount_by_symbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}
+                                        {!! format_amount_by_symbol(entry.amount*-1, entry.currency_symbol, entry.currency_decimal_places) }}
                                     @else
-                                        {{ format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}
+                                        {!! format_amount_by_symbol(entry.amount, entry.currency_symbol, entry.currency_decimal_places) }}
                                     @endif
                                 </span>
                             </td>
diff --git a/resources/views/list/piggy-banks.blade.php b/resources/views/list/piggy-banks.blade.php
index 10aa30a2b9..e7c8b84c22 100644
--- a/resources/views/list/piggy-banks.blade.php
+++ b/resources/views/list/piggy-banks.blade.php
@@ -47,9 +47,9 @@
                     </td>
                     <td class="text-right piggySaved">
                     <span title="Saved so far" class="text-end">
-                        {{ format_amount_by_symbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(piggy.current_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}
                         {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_current_amount %}
-                            ({{ format_amount_by_symbol(piggy.pc_current_amount,$primaryCurrency->symbol,$primaryCurrency->decimal_places) }})
+                            ({!! format_amount_by_symbol(piggy.pc_current_amount,$primaryCurrency->symbol,$primaryCurrency->decimal_places) }})
                         @endif
                     </span>
                     </td>
@@ -88,25 +88,25 @@
                     </td>
                     <td class="hidden-sm hidden-xs text-right">
                         {% if null != piggy.target_amount and 0 != piggy.target_amount %}
-                            <span title="{{ 'target_amount'|_ }}">{{ format_amount_by_symbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
+                            <span title="{{ 'target_amount'|_ }}">{!! format_amount_by_symbol(piggy.target_amount,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
                             {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_target_amount %}
-                                (<span title="{{ 'target_amount'|_ }}">{{ format_amount_by_symbol(piggy.pc_target_amount,$primaryCurrency->symbol, $primaryCurrency->decimal_places) }}</span>)
+                                (<span title="{{ 'target_amount'|_ }}">{!! format_amount_by_symbol(piggy.pc_target_amount,$primaryCurrency->symbol, $primaryCurrency->decimal_places) }}</span>)
                             @endif
                         @endif
                     </td>
                     <td class="hidden-sm hidden-xs text-right">
                         {% if piggy.left_to_save > 0 %}
-                            <span title="{{ 'left_to_save'|_ }}">{{ format_amount_by_symbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
+                            <span title="{{ 'left_to_save'|_ }}">{!! format_amount_by_symbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_decimal_places) }}</span>
                             {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_left_to_save %}
-                                (<span title="{{ 'left_to_save'|_ }}">{{ format_amount_by_symbol(piggy.pc_left_to_save, $primaryCurrency->symbol,$primaryCurrency->decimal_places) }}</span>)
+                                (<span title="{{ 'left_to_save'|_ }}">{!! format_amount_by_symbol(piggy.pc_left_to_save, $primaryCurrency->symbol,$primaryCurrency->decimal_places) }}</span>)
                             @endif
                         @endif
                     </td>
                     <td class="hidden-sm hidden-xs text-right">
                         {% if piggy.target_date and piggy.save_per_month %}
-                            {{ format_amount_by_symbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }}
+                            {!! format_amount_by_symbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_decimal_places) }}
                             {% if convertToPrimary and piggy.currency_id != $primaryCurrency->id and null != piggy.pc_save_per_month %}
-                                ({{ format_amount_by_symbol(piggy.pc_save_per_month, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
+                                ({!! format_amount_by_symbol(piggy.pc_save_per_month, $primaryCurrency->symbol, $primaryCurrency->decimal_places) }})
                             @endif
                         @endif
                     </td>
@@ -120,7 +120,7 @@
                 <td>&nbsp;</td>
                 <td class="text-end">
                     {% for sum in objectGroup.sums %}
-                        {{ format_amount_by_symbol(sum.saved, sum.currency_symbol, sum.currency_decimal_places) }}<br />
+                        {!! format_amount_by_symbol(sum.saved, sum.currency_symbol, sum.currency_decimal_places) }}<br />
                     @endforeach
                     </td>
                 <td class="hidden-sm hidden-xs">&nbsp;</td> {{-- remove money --}}
@@ -128,17 +128,17 @@
                 <td class="hidden-sm hidden-xs">&nbsp;</td> {{-- add money --}}
                 <td class="text-right hidden-sm hidden-xs">
                     {% for sum in objectGroup.sums %}
-                        {{ format_amount_by_symbol(sum.target, sum.currency_symbol, sum.currency_decimal_places) }}<br />
+                        {!! format_amount_by_symbol(sum.target, sum.currency_symbol, sum.currency_decimal_places) }}<br />
                     @endforeach
                 </td>
                 <td class="text-right hidden-sm hidden-xs">
                     {% for sum in objectGroup.sums %}
-                        {{ format_amount_by_symbol(sum.left_to_save, sum.currency_symbol, sum.currency_decimal_places) }}<br />
+                        {!! format_amount_by_symbol(sum.left_to_save, sum.currency_symbol, sum.currency_decimal_places) }}<br />
                     @endforeach
                 </td>
                 <td class="text-right hidden-sm hidden-xs">
                     {% for sum in objectGroup.sums %}
-                        {{ format_amount_by_symbol(sum.save_per_month, sum.currency_symbol, sum.currency_decimal_places) }}<br />
+                        {!! format_amount_by_symbol(sum.save_per_month, sum.currency_symbol, sum.currency_decimal_places) }}<br />
                     @endforeach
                 </td>
             </tr>
diff --git a/resources/views/partials/menu-sidebar.blade.php b/resources/views/partials/menu-sidebar.blade.php
index 82d9ff0be0..8267496c64 100644
--- a/resources/views/partials/menu-sidebar.blade.php
+++ b/resources/views/partials/menu-sidebar.blade.php
@@ -57,7 +57,7 @@
             <li class="{{ activeRoutePartialObjectType('transactions', 'deposit') }}">
                 <a href="{{ route('transactions.index', ['deposit']) }}">
                     <span class="bi bi-caret-right"></span>
-                    <span>{{ 'income'|_ }}</span>
+                    <span>{{ __('firefly.income') }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartialObjectType('transactions', 'transfers') }}">
@@ -161,7 +161,7 @@
             <li class="{{ activeRoutePartial('categories') }}">
                 <a href="{{ route('categories.index') }}">
                     <span class="bi bi-caret-right"></span>
-                    <span>{{ 'categories'|_ }}</span>
+                    <span>{{ __('firefly.categories') }}</span>
                 </a>
             </li>
             <li class="{{ activeRoutePartial('tags') }}">
diff --git a/resources/views/piggy-banks/show.blade.php b/resources/views/piggy-banks/show.blade.php
index 7f6186bd59..de2900649b 100644
--- a/resources/views/piggy-banks/show.blade.php
+++ b/resources/views/piggy-banks/show.blade.php
@@ -105,7 +105,7 @@
                             <tr>
                                 <td>{{ __('firefly.suggested_amount') }}</td>
                                 <td>
-                                    {{ format_amount_by_symbol($piggy['save_per_month'], $piggy['currency_symbol'], $piggy['currency_decimal_places']) }}
+                                    {!! format_amount_by_symbol($piggy['save_per_month'], $piggy['currency_symbol'], $piggy['currency_decimal_places']) }}
                                 </td>
                             </tr>
                         @endif
diff --git a/resources/views/popup/list/journals.blade.php b/resources/views/popup/list/journals.blade.php
index e6f093172e..1323263e3f 100644
--- a/resources/views/popup/list/journals.blade.php
+++ b/resources/views/popup/list/journals.blade.php
@@ -71,23 +71,23 @@
 
             <td>
                 {% if transaction.transaction_type_type == 'Deposit' %}
-                    {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                     {% if null != transaction.foreign_amount %}
-                        ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                        ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                     @endif
                     {% set sum = (sum + (transaction.amount*-1)) %}
                 {% elseif transaction.transaction_type_type == 'Transfer' %}
                     <span class="text-info money-transfer">
-                        {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
+                        {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
                         {% if null != transaction.foreign_amount %}
-                            ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
+                            ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                         @endif
                             </span>
                     {% set sum = (sum + transaction.amount*-1) %}
                 @else
-                    {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                     {% if null != transaction.foreign_amount %}
-                        ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                        ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                     @endif
                     {% set sum = (sum + transaction.amount) %}
                 @endif
@@ -143,7 +143,7 @@
         <td colspan="2" class="text-end"><em>{{ __('firefly.sum') }}:</em></td>
         <td>
             {% if sum != 0 %}
-                {{ format_amount_by_symbol(sum, symbol, decimal_places) }}
+                {!! format_amount_by_symbol(sum, symbol, decimal_places) }}
             @endif
         </td>
     </tr>
diff --git a/resources/views/recurring/old-index.blade.php b/resources/views/recurring/old-index.blade.php
index 9f274dbc8a..f9c56aa547 100644
--- a/resources/views/recurring/old-index.blade.php
+++ b/resources/views/recurring/old-index.blade.php
@@ -74,11 +74,11 @@
                                             {% for rtt in rt.transactions %}
                                                 <li>
                                                     {{-- normal amount + comma --}}
-                                                    {{ format_amount_by_symbol(rtt['amount'],rtt['currency_symbol'],rtt['currency_decimal_places']) }}{% if rtt['foreign_amount'] == null %},@endif
+                                                    {!! format_amount_by_symbol(rtt['amount'],rtt['currency_symbol'],rtt['currency_decimal_places']) }}{% if rtt['foreign_amount'] == null %},@endif
 
                                                     {{-- foreign amount + comma --}}
                                                     {% if null != rtt['foreign_amount'] %}
-                                                        ({{ format_amount_by_symbol(rtt['foreign_amount'],rtt['foreign_currency_symbol'],rtt['foreign_currency_decimal_places']) }}),
+                                                        ({!! format_amount_by_symbol(rtt['foreign_amount'],rtt['foreign_currency_symbol'],rtt['foreign_currency_decimal_places']) }}),
                                                     @endif
                                                     <a href="{{ route('accounts.show', rtt['source_id']) }}">{{ rtt['source_name'] }}</a>
                                                     &rarr;
diff --git a/resources/views/recurring/show.blade.php b/resources/views/recurring/show.blade.php
index 7e0766d9e3..945f00c90c 100644
--- a/resources/views/recurring/show.blade.php
+++ b/resources/views/recurring/show.blade.php
@@ -150,9 +150,9 @@
                                 <a href="{{ route('accounts.show', [transaction.destination_id]) }}">{{ transaction.destination_name }}</a>
                             </td>
                             <td>
-                                {{ format_amount_by_symbol(transaction.amount,transaction.currency_symbol,transaction.currency_decimal_places) }}
+                                {!! format_amount_by_symbol(transaction.amount,transaction.currency_symbol,transaction.currency_decimal_places) }}
                                 {% if null != transaction.foreign_amount %}
-                                    ({{ format_amount_by_symbol(transaction.foreign_amount,transaction.foreign_currency_symbol,transaction.foreign_currency_decimal_places) }})
+                                    ({!! format_amount_by_symbol(transaction.foreign_amount,transaction.foreign_currency_symbol,transaction.foreign_currency_decimal_places) }})
                                 @endif
                             </td>
                             <td data-value="{{ transaction.category_id|default(0) }}">
diff --git a/resources/views/reports/category/month.blade.php b/resources/views/reports/category/month.blade.php
index 83ab9aeaec..20a23fa2bb 100644
--- a/resources/views/reports/category/month.blade.php
+++ b/resources/views/reports/category/month.blade.php
@@ -1,21 +1,20 @@
 @extends('layout.v3.session')
-
-
-    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, categoryIds, start, end) }}
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(Route::getCurrentRoute()->getName(), $accountIds, $categoryIds, $start, $end) }}
 @endsection
 
 @section('content')
 
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
                     <h3 class="card-title">{{ __('firefly.accounts') }}</h3>
                 </div>
                 <div class="card-body p-0" id="accountsHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -23,14 +22,14 @@
             </div>
         </div>
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'categories'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.categories') }}</h3>
                 </div>
                 <div class="card-body p-0" id="categoriesHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -40,14 +39,14 @@
     </div>
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'account_per_category'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.account_per_category') }}</h3>
                 </div>
                 <div class="card-body p-0" id="accountPerCategoryHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -57,7 +56,7 @@
     </div>
     <div class="row">
         <div class="col-lg-4 col-md-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
                     <h3 class="card-title">{{ __('firefly.expense_per_category') }}</h3>
                 </div>
@@ -69,9 +68,9 @@
             </div>
         </div>
         <div class="col-lg-4 col-md-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income_per_category'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.income_per_category') }}</h3>
                 </div>
                 <div class="card-body">
                     <div class="center-chart">
@@ -81,9 +80,9 @@
             </div>
         </div>
         <div class="col-lg-4 col-md-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'expense_per_budget'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.expense_per_budget') }}</h3>
                 </div>
                 <div class="card-body">
                     <div class="center-chart">
@@ -95,7 +94,7 @@
     </div>
     <div class="row">
         <div class="col-lg-6 col-md-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
                     <h3 class="card-title">{{ __('firefly.expense_per_source_account') }}</h3>
                 </div>
@@ -107,9 +106,9 @@
             </div>
         </div>
         <div class="col-lg-6 col-md-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income_per_source_account'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.income_per_source_account') }}</h3>
                 </div>
                 <div class="card-body">
                     <div class="center-chart">
@@ -121,7 +120,7 @@
     </div>
     <div class="row">
         <div class="col-lg-6 col-md-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
                     <h3 class="card-title">{{ __('firefly.expense_per_destination_account') }}</h3>
                 </div>
@@ -133,9 +132,9 @@
             </div>
         </div>
         <div class="col-lg-6 col-md-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income_per_destination_account'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.income_per_destination_account') }}</h3>
                 </div>
                 <div class="card-body">
                     <div class="center-chart">
@@ -146,15 +145,15 @@
         </div>
     </div>
 
-    {% for category in categories %}
+    @foreach($categories as $category)
         <div class="row">
             <div class="col-lg-12">
                 <div class="box main_budget_chart">
                     <div class="card-header">
-                        <h3 class="card-title">{{ 'income_and_expenses'|_ }} ({{ category.name }})</h3>
+                        <h3 class="card-title">{{ __('firefly.income_and_expenses') }} ({{ $category['name'] }})</h3>
                     </div>
                     <div class="card-body">
-                        <canvas class="main_category_canvas" data-url="{{ route('chart.category.main', [accountIds, category.id, $start->format('Ymd'), $end->format('Ymd')]) }}" id="in-out-chart-{{ category.id }}" class="wide-chart" height="400" width="100%"></canvas>
+                        <canvas class="main_category_canvas wide-chart" data-url="{{ route('chart.category.main', [$accountIds, $category['id'], $start->format('Ymd'), $end->format('Ymd')]) }}" id="in-out-chart-{{ $category['id'] }}" height="400" width="100%"></canvas>
                     </div>
                 </div>
             </div>
@@ -162,14 +161,14 @@
     @endforeach
     <div class="row">
         <div class="col-lg-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'average_spending_per_destination'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.average_spending_per_destination') }}</h3>
                 </div>
                 <div class="card-body p-0" id="avgExpensesHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -177,14 +176,14 @@
             </div>
         </div>
         <div class="col-lg-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'average_earning_per_source'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.average_earning_per_source') }}</h3>
                 </div>
                 <div class="card-body p-0" id="avgIncomeHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -194,14 +193,14 @@
     </div>
     <div class="row">
         <div class="col-lg-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ __('firefly.expenses') }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    <h3 class="card-title">{{ __('firefly.expenses') }} ({{ trans('firefly.topX',['number' => $listLength]) }})</h3>
                 </div>
                 <div class="card-body p-0" id="topExpensesHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -209,14 +208,14 @@
             </div>
         </div>
         <div class="col-lg-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    <h3 class="card-title">{{ __('firefly.income') }} ({{ trans('firefly.topX', ['number' => $listLength]) }})</h3>
                 </div>
                 <div class="card-body p-0" id="topIncomeHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -228,6 +227,7 @@
 @endsection
 
 @section('scripts')
+    @vite(['js/pages/generic.js'])
     <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/ff/charts.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
@@ -238,27 +238,27 @@
         // to report another URL:
         var startDate = '{{ $start->format('Ymd') }}';
         var endDate = '{{ $end->format('Ymd') }}';
-        var accountIds = '{{ accountIds }}';
-        var categoryIds = '{{ categoryIds }}';
+        var $accountIds = '{{ $accountIds }}';
+        var categoryIds = '{{ $categoryIds }}';
 
 
-        var accountsUrl = '{{ route('report-data.category.accounts', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var categoriesUrl = '{{ route('report-data.category.categories', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var accountPerCategoryUrl = '{{ route('report-data.category.account-per-category', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var accountsUrl = '{{ route('report-data.category.accounts', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var categoriesUrl = '{{ route('report-data.category.categories', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var accountPerCategoryUrl = '{{ route('report-data.category.account-per-category', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
 
         // pie charts:
-        var categoryOutUrl = '{{ route('chart.category.category-expense', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var categoryInUrl = '{{ route('chart.category.category-income', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var budgetsOutUrl = '{{ route('chart.category.budget-expense', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var sourceOutUrl = '{{ route('chart.category.source-expense', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var sourceInUrl = '{{ route('chart.category.source-income', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var destOutUrl = '{{ route('chart.category.dest-expense', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var destInUrl = '{{ route('chart.category.dest-income', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var categoryOutUrl = '{{ route('chart.category.category-expense', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var categoryInUrl = '{{ route('chart.category.category-income', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var budgetsOutUrl = '{{ route('chart.category.budget-expense', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var sourceOutUrl = '{{ route('chart.category.source-expense', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var sourceInUrl = '{{ route('chart.category.source-income', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var destOutUrl = '{{ route('chart.category.dest-expense', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var destInUrl = '{{ route('chart.category.dest-income', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
 
-        var avgExpensesUrl = '{{ route('report-data.category.avg-expenses', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var topExpensesUrl = '{{ route('report-data.category.top-expenses', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var avgIncomeUrl = '{{ route('report-data.category.avg-income', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var topIncomeUrl = '{{ route('report-data.category.top-income', [accountIds, categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var avgExpensesUrl = '{{ route('report-data.category.avg-expenses', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var topExpensesUrl = '{{ route('report-data.category.top-expenses', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var avgIncomeUrl = '{{ route('report-data.category.avg-income', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var topIncomeUrl = '{{ route('report-data.category.top-income', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
 
     </script>
     <script type="text/javascript" src="v1/js/ff/reports/category/month.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
diff --git a/resources/views/reports/category/partials/account-per-category.blade.php b/resources/views/reports/category/partials/account-per-category.blade.php
index 71942d61e7..b5397e26a3 100644
--- a/resources/views/reports/category/partials/account-per-category.blade.php
+++ b/resources/views/reports/category/partials/account-per-category.blade.php
@@ -2,24 +2,24 @@
     <thead>
     <tr>
         <th data-defaultsign="az">{{ __('firefly.name') }}</th>
-        {% for category in categories %}
-            <th data-defaultsign="_19" class="text-end">{{ category.name }}</th>
+        @foreach($categories as $category)
+            <th data-defaultsign="_19" class="text-end">{{ $category['name'] }}</th>
         @endforeach
     </tr>
     </thead>
     <tbody>
-    {% for account in report %}
-        {% for currency in account.currencies %}
+    @foreach($report as $account)
+        @foreach($account['currencies'] as $currency)
             <tr>
-                <td data-value="{{ account.name }} ({{ currency.currency_name }})">
-                    <a href="{{ route('accounts.show', account.id) }}" title="{{ account.iban }}">{{ account.name }} ({{ currency.currency_name }})</a>
+                <td data-value="{{ $account['name'] }} ({{ $currency['currency_name'] }})">
+                    <a href="{{ route('accounts.show', $account['id']) }}" title="{{ $account['iban'] }}">{{ $account['name'] }} ({{ $currency['currency_name'] }})</a>
                 </td>
-                {% for category in categories %}
+                @foreach($categories as $category)
                     <td class="text-end">
-                        {% if currency.categories[category.id] %}
-                            <span title="{{ 'earned'|_ }}: {{ format_amount_by_symbol(currency.categories[category.id].earned, currency.currency_symbol, currency.currency_decimal_places, false) }}, {{ __('firefly.spent') }}: {{ format_amount_by_symbol(currency.categories[category.id].spent, currency.currency_symbol, currency.currency_decimal_places, false) }}"
-                            {{ format_amount_by_symbol(currency.categories[category.id].sum, currency.currency_symbol, currency.currency_decimal_places) }}
-                        @else
+                        @if(array_key_exists($category['id'], $currency['categories']))
+                            <span title="{{ __('firefly.earned') }}: {!! format_amount_by_symbol($currency['categories'][$category['id']]['earned'], $currency['currency_symbol'], $currency['currency_decimal_places'], false) !!}, {{ __('firefly.spent') }}: {!! format_amount_by_symbol($currency['categories'][$category['id']]['spent'], $currency['currency_symbol'], $currency['currency_decimal_places'], false) !!}"
+                            {!! format_amount_by_symbol($currency['categories'][$category['id']]['sum'], $currency['currency_symbol'], $currency['currency_decimal_places'])  !!}
+                            @else
                             &mdash;
                         @endif
                     </td>
diff --git a/resources/views/reports/category/partials/accounts.blade.php b/resources/views/reports/category/partials/accounts.blade.php
index 5c7dddf5b7..52040ac64f 100644
--- a/resources/views/reports/category/partials/accounts.blade.php
+++ b/resources/views/reports/category/partials/accounts.blade.php
@@ -3,42 +3,42 @@
     <tr>
         <th data-defaultsign="az">{{ __('firefly.name') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.spent') }}</th>
-        <th data-defaultsign="_19" class="text-end">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" class="text-end">{{ __('firefly.earned') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.sum') }}</th>
     </tr>
     </thead>
     <tbody>
-    {% for account in report %}
-        {% for currency in account.currencies %}
+    @foreach($report as $account)
+        @foreach($account['currencies'] as $currency)
             <tr>
-                <td data-value="{{ account.name }} ({{ currency.currency_name }})">
-                    <a href="{{ route('accounts.show', account.id) }}" title="{{ account.iban }}">{{ account.name }} ({{ currency.currency_name }})</a>
+                <td data-value="{{ $account['name'] }} ({{ $currency['currency_name'] }})">
+                    <a href="{{ route('accounts.show', $account['id']) }}" title="{{ $account['iban'] }}">{{ $account['name'] }} ({{ $currency['currency_name'] }})</a>
                 </td>
-                <td data-value="{{ currency.spent }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.spent, currency.currency_symbol, currency.currency_decimal_places) }}
+                <td data-value="{{ $currency['spent'] }}" class="text-end">
+                    {!! format_amount_by_symbol($currency['spent'], $currency['currency_symbol'], $currency['currency_decimal_places']) !!}
                 </td>
-                <td data-value="{{ currency.earned }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.earned, currency.currency_symbol, currency.currency_decimal_places) }}
+                <td data-value="{{ $currency['earned'] }}" class="text-end">
+                    {!! format_amount_by_symbol($currency['earned'], $currency['currency_symbol'], $currency['currency_decimal_places']) !!}
                 </td>
-                <td data-value="{{ currency.sum }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}
+                <td data-value="{{ $currency['sum'] }}" class="text-end">
+                    {!! format_amount_by_symbol($currency['sum'], $currency['currency_symbol'], $currency['currency_decimal_places']) !!}
                 </td>
             </tr>
         @endforeach
     @endforeach
     </tbody>
     <tfoot>
-    {% for sum in sums %}
+    @foreach($sums as $sum)
         <tr>
-            <td>{{ __('firefly.sum') }} ({{ sum.currency_name }})</td>
+            <td>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }})</td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.spent_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol($sum['spent_sum'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.earned_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol($sum['earned_sum'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.total_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol($sum['total_sum'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
             </td>
         </tr>
     @endforeach
diff --git a/resources/views/reports/category/partials/avg-expenses.blade.php b/resources/views/reports/category/partials/avg-expenses.blade.php
index c84107c088..1a72faac2c 100644
--- a/resources/views/reports/category/partials/avg-expenses.blade.php
+++ b/resources/views/reports/category/partials/avg-expenses.blade.php
@@ -8,37 +8,37 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.destination_account_id) }}">
-                {{ row.destination_account_name }}
+            <a href="{{ route('accounts.show', $row['destination_account_id']) }}">
+                {{ $row['destination_account_name'] }}
             </a>
         </td>
-        <td data-value="{{ row.avg }}" class="text-end">
-            {{ format_amount_by_symbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['avg'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['avg'], $row['currency_symbol'], $row['currency_decimal_places']) !!}
         </td>
 
-        <td data-value="{{ row.sum }}" class="text-end">
-            {{ format_amount_by_symbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['sum'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['sum'], $row['currency_symbol'], $row['currency_decimal_places']) !!}
         </td>
 
-        <td data-value="{{ row.transactions }}">
-            {{ row.transactions }}
+        <td data-value="{{ $row['transactions'] }}">
+            {{ $row['transactions'] }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/category/partials/avg-income.blade.php b/resources/views/reports/category/partials/avg-income.blade.php
index a9bd6d8cea..0c00468cb2 100644
--- a/resources/views/reports/category/partials/avg-income.blade.php
+++ b/resources/views/reports/category/partials/avg-income.blade.php
@@ -2,43 +2,43 @@
     <thead>
     <tr>
         <th data-defaultsign="az">{{ __('firefly.account') }}</th>
-        <th data-defaultsign="_19" class="text-end">{{ 'income_average'|_ }}</th>
+        <th data-defaultsign="_19" class="text-end">{{ __('firefly.income_average') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.total') }}</th>
         <th data-defaultsign="_19">{{ __('firefly.transaction_count') }}</th>
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.source_account_id) }}">
-                {{ row.source_account_name }}
+            <a href="{{ route('accounts.show', $row['source_account_id']) }}">
+                {{ $row['source_account_name'] }}
             </a>
         </td>
-        <td data-value="{{ row.avg }}" class="text-end">
-            {{ format_amount_by_symbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['avg'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['avg'], $row['currency_symbol'], $row['currency_decimal_places']) !!}
         </td>
 
-        <td data-value="{{ row.sum }}" class="text-end">
-            {{ format_amount_by_symbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['sum'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['sum'], $row['currency_symbol'], $row['currency_decimal_places']) !!}
         </td>
 
-        <td data-value="{{ row.transactions }}">
-            {{ row.transactions }}
+        <td data-value="{{ $row['transactions'] }}">
+            {{ $row['transactions'] }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/category/partials/categories.blade.php b/resources/views/reports/category/partials/categories.blade.php
index 7bbeeb26b2..9cf1186acf 100644
--- a/resources/views/reports/category/partials/categories.blade.php
+++ b/resources/views/reports/category/partials/categories.blade.php
@@ -3,52 +3,52 @@
     <tr>
         <th data-defaultsign="az">{{ __('firefly.name') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.spent') }}</th>
-        <th data-defaultsign="_19" class="text-end">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" class="text-end">{{ __('firefly.earned') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.sum') }}</th>
     </tr>
     </thead>
     <tbody>
-    {% for category in report %}
-        {% if category.currencies|length == 0 %}
+    @foreach($report as $category)
+        @if(0 === count($category['currencies']))
             <tr>
-                <td data-value="{{ category.name }}">
-                    <a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }}</a>
+                <td data-value="{{ $category['name'] }}">
+                    <a href="{{ route('categories.show', $category['id']) }}" title="{{ $category['name'] }}">{{ $category['name'] }}</a>
                 </td>
                 <td class="text-end">&mdash;</td>
                 <td class="text-end">&mdash;</td>
                 <td class="text-end">&mdash;</td>
             </tr>
         @endif
-        {% for currency in category.currencies %}
+        @foreach($category['currencies'] as $currency)
             <tr>
-                <td data-value="{{ category.name }} ({{ currency.currency_name }})">
-                    <a href="{{ route('categories.show', category.id) }}" title="{{ category.name }}">{{ category.name }} ({{ currency.currency_name }})</a>
+                <td data-value="{{ $category['name'] }} ({{ $currency['currency_name'] }})">
+                    <a href="{{ route('categories.show', $category['id']) }}" title="{{ $category['name'] }}">{{ $category['name'] }} ({{ $currency['currency_name'] }})</a>
                 </td>
-                <td data-value="{{ currency.spent }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.spent, currency.currency_symbol, currency.currency_decimal_places) }}
+                <td data-value="{{ $currency['spent'] }}" class="text-end">
+                    {!! format_amount_by_symbol($currency['spent'], $currency['currency_symbol'], $currency['currency_decimal_places']) !!}
                 </td>
-                <td data-value="{{ currency.earned }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.earned, currency.currency_symbol, currency.currency_decimal_places) }}
+                <td data-value="{{ $currency['earned'] }}" class="text-end">
+                    {!! format_amount_by_symbol($currency['earned'], $currency['currency_symbol'], $currency['currency_decimal_places']) !!}
                 </td>
-                <td data-value="{{ currency.sum }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}
+                <td data-value="{{ $currency['sum'] }}" class="text-end">
+                    {!! format_amount_by_symbol($currency['sum'], $currency['currency_symbol'], $currency['currency_decimal_places']) !!}
                 </td>
             </tr>
         @endforeach
     @endforeach
     </tbody>
     <tfoot>
-    {% for sum in sums %}
+    @foreach($sums as $sum)
         <tr>
-            <td>{{ __('firefly.sum') }} ({{ sum.currency_name }})</td>
+            <td>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }})</td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.spent_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol($sum['spent_sum'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.earned_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol($sum['earned_sum'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.total_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol($sum['total_sum'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
             </td>
         </tr>
     @endforeach
diff --git a/resources/views/reports/category/partials/top-expenses.blade.php b/resources/views/reports/category/partials/top-expenses.blade.php
index 735a224bdf..859d3dcd4a 100644
--- a/resources/views/reports/category/partials/top-expenses.blade.php
+++ b/resources/views/reports/category/partials/top-expenses.blade.php
@@ -9,44 +9,44 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('transactions.show', row.transaction_group_id) }}">
-                {{ row.description }}
+            <a href="{{ route('transactions.show', $row['transaction_group_id']) }}">
+                {{ $row['description'] }}
             </a>
         </td>
-        <td data-value="{{ row.date_sort }}">
-            {{ row.date }}
+        <td data-value="{{ $row['date_sort'] }}">
+            {{ $row['date'] }}
         </td>
 
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.destination_account_id) }}">
-                {{ row.destination_account_name }}
+            <a href="{{ route('accounts.show', $row['destination_account_id']) }}">
+                {{ $row['destination_account_name'] }}
             </a>
         </td>
         <td data-sortable="false">
-            <a href="{{ route('categories.show', row.category_id) }}">
-                {{ row.category_name }}
+            <a href="{{ route('categories.show', $row['category_id']) }}">
+                {{ $row['category_name'] }}
             </a>
         </td>
 
-        <td data-value="{{ row.amount }}" class="text-end">
-            {{ format_amount_by_symbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['amount'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['amount'], $row['currency_symbol'], $row['currency_decimal_places']) !!}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/category/partials/top-income.blade.php b/resources/views/reports/category/partials/top-income.blade.php
index adf6c1ecef..258e8fe8ea 100644
--- a/resources/views/reports/category/partials/top-income.blade.php
+++ b/resources/views/reports/category/partials/top-income.blade.php
@@ -9,44 +9,44 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('transactions.show', row.transaction_group_id) }}">
-                {{ row.description }}
+            <a href="{{ route('transactions.show', $row['transaction_group_id']) }}">
+                {{ $row['description'] }}
             </a>
         </td>
-        <td data-value="{{ row.date_sort }}">
-            {{ row.date }}
+        <td data-value="{{ $row['date_sort'] }}">
+            {{ $row['date'] }}
         </td>
 
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.source_account_id) }}">
-                {{ row.source_account_name }}
+            <a href="{{ route('accounts.show', $row['source_account_id']) }}">
+                {{ row['source_account_name'] }}
             </a>
         </td>
         <td data-sortable="false">
-            <a href="{{ route('categories.show', row.category_id) }}">
-                {{ row.category_name }}
+            <a href="{{ route('categories.show', $row['category_id']) }}">
+                {{ $row['category_name'] }}
             </a>
         </td>
 
-        <td data-value="{{ row.amount }}" class="text-end">
-            {{ format_amount_by_symbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['amount'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['amount'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/default/month.blade.php b/resources/views/reports/default/month.blade.php
index eb2d3dca68..95225574cd 100644
--- a/resources/views/reports/default/month.blade.php
+++ b/resources/views/reports/default/month.blade.php
@@ -1,7 +1,6 @@
 @extends('layout.v3.session')
-
-
-    {{ Breadcrumbs.render(Route.getCurrentRoute.getName, accountIds, start, end) }}
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(Route::getCurrentRoute()->getName(), $accountIds, $start, $end) }}
 @endsection
 
 @section('content')
@@ -9,9 +8,9 @@
     {{-- chart --}}
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'accountBalances'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.accountBalances') }}</h3>
                 </div>
                 <div class="card-body">
                     <canvas id="account-balances-chart" class="wide-chart" height="400" width="100%"></canvas>
@@ -23,14 +22,14 @@
     {{-- account balances and income vs. expense --}}
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'accountBalances'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.accountBalances') }}</h3>
                 </div>
                 <div class="card-body p-0" id="accountReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -38,14 +37,14 @@
             </div>
         </div>
         <div class="col-lg-6 col-md-6 col-sm-6">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.incomeVsExpenses') }}</h3>
                 </div>
                 <div class="card-body p-0" id="incomeVsExpenseReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -57,14 +56,14 @@
     {{-- in and out --}}
     <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.income') }}</h3>
                 </div>
                 <div class="card-body p-0" id="incomeReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -72,14 +71,14 @@
             </div>
         </div>
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
                     <h3 class="card-title">{{ __('firefly.expenses') }}</h3>
                 </div>
                 <div class="card-body p-0" id="expenseReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -90,7 +89,7 @@
 
     <div class="row">
         <div class="col-lg-8 col-md-8 col-sm-12">
-            <div class="card">
+            <div class="card mb-2">
 
                 <div class="card-header">
                     <h3 class="card-title">{{ __('firefly.budgets') }}</h3>
@@ -98,7 +97,7 @@
                 <div class="card-body p-0" id="budgetReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -108,13 +107,13 @@
 
         </div>
         <div class="col-lg-4 col-md-4 col-sm-12">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'categories'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.categories') }}</h3>
                 </div>
                 <div class="card-body p-0" id="categoryReport"></div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -124,14 +123,14 @@
     </div>
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ __('firefly.budgets') }} ({{ 'splitByAccount'|_|lower }})</h3>
+                    <h3 class="card-title">{{ __('firefly.budgets') }} ({{ strtolower(__('firefly.splitByAccount')) }})</h3>
                 </div>
                 <div class="card-body p-0" id="balanceReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -142,13 +141,13 @@
     </div>
     <div class="row">
         <div class="col-lg-12 col-md-12 col-sm-12">
-            <div class="card">
+            <div class="card mb-2">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'bills'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.bills') }}</h3>
                 </div>
                 <div class="card-body p-0" id="billReport"></div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -161,7 +160,7 @@
     <link rel="stylesheet" href="v1/css/bootstrap-sortable.css?v={{ $FF_BUILD_TIME }}" type="text/css" media="all" nonce="{{ $JS_NONCE }}">
 @endsection
 @section('scripts')
-
+    @vite(['js/pages/generic.js'])
     <script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
     <script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
@@ -173,19 +172,19 @@
         // to report another URL:
         var startDate = '{{ $start->format('Ymd') }}';
         var endDate = '{{ $end->format('Ymd') }}';
-        var reportType = '{{ reportType }}';
-        var accountIds = '{{ accountIds }}';
+        var reportType = '{{ $reportType }}';
+        var $accountIds = '{{ $accountIds }}';
 
-        var accountReportUrl = '{{ route('report-data.account.general', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var categoryReportUrl = '{{ route('report-data.category.operations', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var budgetReportUrl = '{{ route('report-data.budget.general', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var balanceReportUrl = '{{ route('report-data.balance.general', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var incomeReportUrl = '{{ route('report-data.operations.income', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var expenseReportUrl = '{{ route('report-data.operations.expenses', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var incExpReportUrl = '{{ route('report-data.operations.operations', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
-        var billReportUrl = '{{ route('report-data.bills.overview', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var accountReportUrl = '{{ route('report-data.account.general', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var categoryReportUrl = '{{ route('report-data.category.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var budgetReportUrl = '{{ route('report-data.budget.general', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var balanceReportUrl = '{{ route('report-data.balance.general', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var incomeReportUrl = '{{ route('report-data.operations.income', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var expenseReportUrl = '{{ route('report-data.operations.expenses', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var incExpReportUrl = '{{ route('report-data.operations.operations', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var billReportUrl = '{{ route('report-data.bills.overview', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
 
-        var accountChartUrl = '{{ route('chart.account.report', [accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
+        var accountChartUrl = '{{ route('chart.account.report', [$accountIds, $start->format('Ymd'), $end->format('Ymd')]) }}';
 
     </script>
     <script type="text/javascript" src="v1/js/ff/reports/all.js?v={{ $FF_BUILD_TIME }}" nonce="{{ $JS_NONCE }}"></script>
diff --git a/resources/views/reports/default/multi-year.blade.php b/resources/views/reports/default/multi-year.blade.php
index 11f7b05579..ab1af190d7 100644
--- a/resources/views/reports/default/multi-year.blade.php
+++ b/resources/views/reports/default/multi-year.blade.php
@@ -11,7 +11,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="card" id="year-inc-exp">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.incomeVsExpenses') }}</h3>
                 </div>
                 <div class="card-body">
                     <canvas id="income-expenses-chart" class="wide-chart" height="400" width="100%"></canvas>
@@ -25,12 +25,12 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'accountBalances'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.accountBalances') }}</h3>
                 </div>
                 <div class="card-body p-0" id="accountReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -40,12 +40,12 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.incomeVsExpenses') }}</h3>
                 </div>
                 <div class="card-body p-0" id="incomeVsExpenseReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -59,12 +59,12 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.income') }}</h3>
                 </div>
                 <div class="card-body p-0" id="incomeReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -80,7 +80,7 @@
                 <div class="card-body p-0" id="expenseReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -119,7 +119,7 @@
                 <div class="box-body no-padding table-responsive" id="budgetPeriodReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -149,12 +149,12 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'categories'|_ }} ({{ __('firefly.expenses') }})</h3>
+                    <h3 class="card-title">{{ __('firefly.categories') }} ({{ __('firefly.expenses') }})</h3>
                 </div>
                 <div class="box-body no-padding table-responsive" id="categoryExpense">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -168,12 +168,12 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'categories'|_ }} ({{ 'income'|_ }})</h3>
+                    <h3 class="card-title">{{ __('firefly.categories') }} ({{ __('firefly.income') }})</h3>
                 </div>
                 <div class="box-body no-padding table-responsive" id="categoryIncome">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
diff --git a/resources/views/reports/default/year.blade.php b/resources/views/reports/default/year.blade.php
index 1bc90ccb1a..7f46d6019c 100644
--- a/resources/views/reports/default/year.blade.php
+++ b/resources/views/reports/default/year.blade.php
@@ -11,7 +11,7 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="card" id="year-inc-exp">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.incomeVsExpenses') }}</h3>
                 </div>
                 <div class="card-body">
                     <canvas id="income-expenses-chart" class="wide-chart" height="400" width="100%"></canvas>
@@ -25,12 +25,12 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'accountBalances'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.accountBalances') }}</h3>
                 </div>
                 <div class="card-body p-0" id="accountReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -40,12 +40,12 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.incomeVsExpenses') }}</h3>
                 </div>
                 <div class="card-body p-0" id="incomeVsExpenseReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -59,12 +59,12 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.income') }}</h3>
                 </div>
                 <div class="card-body p-0" id="incomeReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -79,7 +79,7 @@
                 <div class="card-body p-0" id="expenseReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -117,7 +117,7 @@
                 <div class="box-body no-padding table-responsive" id="budgetPeriodReport">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -147,12 +147,12 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'categories'|_ }} ({{ __('firefly.expenses') }})</h3>
+                    <h3 class="card-title">{{ __('firefly.categories') }} ({{ __('firefly.expenses') }})</h3>
                 </div>
                 <div class="box-body no-padding table-responsive" id="categoryExpense">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -166,12 +166,12 @@
         <div class="col-lg-12 col-md-12 col-sm-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'categories'|_ }} ({{ 'income'|_ }})</h3>
+                    <h3 class="card-title">{{ __('firefly.categories') }} ({{ __('firefly.income') }})</h3>
                 </div>
                 <div class="box-body no-padding table-responsive" id="categoryIncome">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
diff --git a/resources/views/reports/double/partials/accounts-per-asset.blade.php b/resources/views/reports/double/partials/accounts-per-asset.blade.php
index f548b5b320..7221cef980 100644
--- a/resources/views/reports/double/partials/accounts-per-asset.blade.php
+++ b/resources/views/reports/double/partials/accounts-per-asset.blade.php
@@ -3,24 +3,24 @@
     <tr>
         <th data-defaultsign="az">{{ __('firefly.name') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.spent') }}</th>
-        <th data-defaultsign="_19" class="text-end">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" class="text-end">{{ __('firefly.earned') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.sum') }}</th>
     </tr>
     </thead>
     <tbody>
-    {% for account in report %}
+    @foreach($report as $account)
         <tr>
             <td>
                 <a href="{{ route('accounts.show', [account.account_id]) }}" title="{{ account.account_name }}">{{ account.account_name }}</a>
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(account.spent, account.currency_symbol, account.currency_decimal_places) }}
+                {!! format_amount_by_symbol(account.spent, account.currency_symbol, account.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(account.earned, account.currency_symbol, account.currency_decimal_places) }}
+                {!! format_amount_by_symbol(account.earned, account.currency_symbol, account.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}
+                {!! format_amount_by_symbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}
             </td>
         </tr>
     @endforeach
@@ -30,13 +30,13 @@
         <tr>
             <td>{{ __('firefly.sum') }} ({{ sum.currency_name }})</td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.earned, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.earned, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
         </tr>
     @endforeach
diff --git a/resources/views/reports/double/partials/accounts.blade.php b/resources/views/reports/double/partials/accounts.blade.php
index 97dc2a333e..755f9b44bd 100644
--- a/resources/views/reports/double/partials/accounts.blade.php
+++ b/resources/views/reports/double/partials/accounts.blade.php
@@ -3,12 +3,12 @@
     <tr>
         <th data-defaultsign="az">{{ __('firefly.name') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.spent') }}</th>
-        <th data-defaultsign="_19" class="text-end">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" class="text-end">{{ __('firefly.earned') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.sum') }}</th>
     </tr>
     </thead>
     <tbody>
-    {% for account in report %}
+    @foreach($report as $account)
         <tr>
             <td>
                 {% if account.source_name == account.dest_name %}
@@ -25,13 +25,13 @@
                 @endif
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(account.spent, account.currency_symbol, account.currency_decimal_places) }}
+                {!! format_amount_by_symbol(account.spent, account.currency_symbol, account.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(account.earned, account.currency_symbol, account.currency_decimal_places) }}
+                {!! format_amount_by_symbol(account.earned, account.currency_symbol, account.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}
+                {!! format_amount_by_symbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}
             </td>
         </tr>
     @endforeach
@@ -41,13 +41,13 @@
         <tr>
             <td>{{ __('firefly.sum') }} ({{ sum.currency_name }})</td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.earned, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.earned, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
         </tr>
     @endforeach
diff --git a/resources/views/reports/double/partials/avg-expenses.blade.php b/resources/views/reports/double/partials/avg-expenses.blade.php
index 58767c7283..bb66c4c3c7 100644
--- a/resources/views/reports/double/partials/avg-expenses.blade.php
+++ b/resources/views/reports/double/partials/avg-expenses.blade.php
@@ -8,37 +8,37 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.source_account_id) }}">
-                {{ row.source_account_name }}
+            <a href="{{ route('accounts.show', $row['source_account_id']) }}">
+                {{ row['source_account_name'] }}
             </a>
         </td>
-        <td data-value="{{ row.avg }}" class="text-end">
-            {{ format_amount_by_symbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['avg'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['avg'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
-        <td data-value="{{ row.sum }}" class="text-end">
-            {{ format_amount_by_symbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['sum'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['sum'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
-        <td data-value="{{ row.transactions }}">
-            {{ row.transactions }}
+        <td data-value="{{ $row['transactions'] }}">
+            {{ $row['transactions'] }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/double/partials/avg-income.blade.php b/resources/views/reports/double/partials/avg-income.blade.php
index c84107c088..a815a04017 100644
--- a/resources/views/reports/double/partials/avg-income.blade.php
+++ b/resources/views/reports/double/partials/avg-income.blade.php
@@ -8,37 +8,37 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.destination_account_id) }}">
-                {{ row.destination_account_name }}
+            <a href="{{ route('accounts.show', $row['destination_account_id']) }}">
+                {{ $row['destination_account_name'] }}
             </a>
         </td>
-        <td data-value="{{ row.avg }}" class="text-end">
-            {{ format_amount_by_symbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['avg'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['avg'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
-        <td data-value="{{ row.sum }}" class="text-end">
-            {{ format_amount_by_symbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['sum'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['sum'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
-        <td data-value="{{ row.transactions }}">
-            {{ row.transactions }}
+        <td data-value="{{ $row['transactions'] }}">
+            {{ $row['transactions'] }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/double/partials/top-expenses.blade.php b/resources/views/reports/double/partials/top-expenses.blade.php
index 80562baff1..8927dd0fcb 100644
--- a/resources/views/reports/double/partials/top-expenses.blade.php
+++ b/resources/views/reports/double/partials/top-expenses.blade.php
@@ -9,45 +9,45 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('transactions.show', row.transaction_group_id) }}">
-                {{ row.description }}
+            <a href="{{ route('transactions.show', $row['transaction_group_id']) }}">
+                {{ $row['description'] }}
             </a>
         </td>
-        <td data-value="{{ row.date_sort }}">
-            {{ row.date }}
+        <td data-value="{{ $row['date_sort'] }}">
+            {{ $row['date'] }}
         </td>
 
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.source_account_id) }}">
-                {{ row.source_account_name }}
+            <a href="{{ route('accounts.show', $row['source_account_id']) }}">
+                {{ row['source_account_name'] }}
             </a>
         </td>
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.destination_account_id) }}">
-                {{ row.destination_account_name }}
+            <a href="{{ route('accounts.show', $row['destination_account_id']) }}">
+                {{ $row['destination_account_name'] }}
             </a>
         </td>
 
 
-        <td data-value="{{ row.amount }}" class="text-end">
-            {{ format_amount_by_symbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['amount'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['amount'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/double/partials/top-income.blade.php b/resources/views/reports/double/partials/top-income.blade.php
index 80562baff1..8927dd0fcb 100644
--- a/resources/views/reports/double/partials/top-income.blade.php
+++ b/resources/views/reports/double/partials/top-income.blade.php
@@ -9,45 +9,45 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('transactions.show', row.transaction_group_id) }}">
-                {{ row.description }}
+            <a href="{{ route('transactions.show', $row['transaction_group_id']) }}">
+                {{ $row['description'] }}
             </a>
         </td>
-        <td data-value="{{ row.date_sort }}">
-            {{ row.date }}
+        <td data-value="{{ $row['date_sort'] }}">
+            {{ $row['date'] }}
         </td>
 
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.source_account_id) }}">
-                {{ row.source_account_name }}
+            <a href="{{ route('accounts.show', $row['source_account_id']) }}">
+                {{ row['source_account_name'] }}
             </a>
         </td>
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.destination_account_id) }}">
-                {{ row.destination_account_name }}
+            <a href="{{ route('accounts.show', $row['destination_account_id']) }}">
+                {{ $row['destination_account_name'] }}
             </a>
         </td>
 
 
-        <td data-value="{{ row.amount }}" class="text-end">
-            {{ format_amount_by_symbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['amount'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['amount'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/double/report.blade.php b/resources/views/reports/double/report.blade.php
index 6d99440190..319f08ef06 100644
--- a/resources/views/reports/double/report.blade.php
+++ b/resources/views/reports/double/report.blade.php
@@ -14,7 +14,7 @@
                 </div>
                 <div class="card-body p-0" id="opsAccounts">
                     {{-- loading indicator --}}
-                    <div class="overlay">
+                    <div class="overlay text-center m-2">
                         <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -30,7 +30,7 @@
                 </div>
                 <div class="card-body p-0" id="opsAccountsAsset">
                     {{-- loading indicator --}}
-                    <div class="overlay">
+                    <div class="overlay text-center m-2">
                         <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -56,7 +56,7 @@
         <div class="col-lg-4 col-md-6">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income_per_category'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.income_per_category') }}</h3>
                 </div>
                 <div class="card-body">
                     <div class="center-chart">
@@ -68,7 +68,7 @@
         <div class="col-lg-4 col-md-6">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'expense_per_budget'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.expense_per_budget') }}</h3>
                 </div>
                 <div class="card-body">
                     <div class="center-chart">
@@ -122,7 +122,7 @@
             <div class="col-lg-12">
                 <div class="card" id="incomeAndExpensesChart">
                     <div class="card-header">
-                        <h3 class="card-title">{{ 'income_and_expenses'|_ }} ({{ account.name }}) {% if account.iban %}({{ account.iban }})@endif</h3>
+                        <h3 class="card-title">{{ __('firefly.income_and_expenses') }} ({{ $account['name'] }}) {% if $account['iban'] %}({{ $account['iban'] }})@endif</h3>
                     </div>
                     <div class="card-body">
                         <canvas class="main_double_canvas"
@@ -138,11 +138,11 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ __('firefly.expenses') }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    <h3 class="card-title">{{ __('firefly.expenses') }} ({{ trans('firefly.topX', ['number' => $listLength]) }})</h3>
                 </div>
                 <div class="card-body p-0" id="topExpensesHolder">
                     {{-- loading indicator --}}
-                    <div class="overlay">
+                    <div class="overlay text-center m-2">
                         <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -154,11 +154,11 @@
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    <h3 class="card-title">{{ __('firefly.income') }} ({{ trans('firefly.topX', ['number' => $listLength]) }})</h3>
                 </div>
                 <div class="card-body p-0" id="topIncomeHolder">
                     {{-- loading indicator --}}
-                    <div class="overlay">
+                    <div class="overlay text-center m-2">
                         <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -177,7 +177,7 @@
                 <div class="card-body p-0" id="avgExpensesHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -192,7 +192,7 @@
                 <div class="card-body p-0" id="avgIncomeHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
diff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.php
index 9b61634d6f..cc64c78566 100644
--- a/resources/views/reports/index.blade.php
+++ b/resources/views/reports/index.blade.php
@@ -87,7 +87,7 @@
                     <div class="card-body" id="extra-options">
                     </div>
                     {{-- extra options loading indicator. --}}
-                    <div class="overlay">
+                    <div class="overlay text-center m-2">
                         <div class="spinner-border spinner-border-sm" role="status">
                             <span class="visually-hidden">Loading...</span>
                         </div>
diff --git a/resources/views/reports/partials/accounts.blade.php b/resources/views/reports/partials/accounts.blade.php
index a67e06209c..b8d826bcce 100644
--- a/resources/views/reports/partials/accounts.blade.php
+++ b/resources/views/reports/partials/accounts.blade.php
@@ -2,45 +2,45 @@
     <thead>
     <tr>
         <th data-defaultsign="az">{{ __('firefly.name') }}</th>
-        <th data-defaultsign="_19" class="text-right hidden-xs">{{ 'balanceStart'|_ }}</th>
-        <th data-defaultsign="_19" class="text-right hidden-xs">{{ 'balanceEnd'|_ }}</th>
-        <th data-defaultsign="_19" class="text-end">{{ 'difference'|_ }}</th>
+        <th data-defaultsign="_19" class="text-right hidden-xs">{{ __('firefly.balanceStart') }}</th>
+        <th data-defaultsign="_19" class="text-right hidden-xs">{{ __('firefly.balanceEnd') }}</th>
+        <th data-defaultsign="_19" class="text-end">{{ __('firefly.difference') }}</th>
     </tr>
     </thead>
     <tbody>
-    {% for account in accountReport.accounts %}
+    @foreach($accountReport['accounts'] as $account)
         <tr>
-            <td data-value="{{ account.name }}">
-                <a href="{{ route('accounts.show',account.id) }}" title="{{ account.name }}">{{ account.name }}</a>
+            <td data-value="{{ $account['name'] }}">
+                <a href="{{ route('accounts.show', $account['id']) }}" title="{{ $account['name'] }}">{{ $account['name'] }}</a>
             </td>
-            <td class="text-right hidden-xs" data-value="{{ account.start_balance }}">
-                {{ format_amount_by_symbol(account.start_balance, account.currency_symbol, account.currency_decimal_places) }}
+            <td class="text-right hidden-xs" data-value="{{ $account['start_balance'] }}">
+                {!! format_amount_by_symbol($account['start_balance'], $account['currency_symbol'], $account['currency_decimal_places']) !!}
             </td>
-            <td class="text-right hidden-xs" data-value="{{ account.end_balance }}">
-                {{ format_amount_by_symbol(account.end_balance, account.currency_symbol, account.currency_decimal_places) }}
+            <td class="text-right hidden-xs" data-value="{{ $account['end_balance'] }}">
+                {!! format_amount_by_symbol($account['end_balance'], $account['currency_symbol'], $account['currency_decimal_places']) !!}
             </td>
             <td class="text-end"
-                data-value="{{ (account.end_balance - account.start_balance) }}">
-                {{ format_amount_by_symbol(account.end_balance - account.start_balance, account.currency_symbol, account.currency_decimal_places) }}
+                data-value="{{ ($account['end_balance'] - $account['start_balance']) }}">
+                {!! format_amount_by_symbol($account['end_balance'] - $account['start_balance'], $account['currency_symbol'], $account['currency_decimal_places']) !!}
             </td>
         </tr>
     @endforeach
     <tr>
-        <td colspan="4"><em>{{ 'sumOfSums'|_ }}</em></td>
+        <td colspan="4"><em>{{ __('firefly.sumOfSums') }}</em></td>
     </tr>
-    {% for sum in accountReport.sums %}
+    @foreach($accountReport['sums'] as $sum)
     <tr>
         <td>
             &nbsp;
         </td>
         <td class="text-end">
-            {{ format_amount_by_symbol(sum.start, sum.currency_symbol, sum.currency_decimal_places) }}
+            {!! format_amount_by_symbol($sum['start'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
         </td>
         <td class="text-end">
-            {{ format_amount_by_symbol(sum.end, sum.currency_symbol, sum.currency_decimal_places) }}
+            {!! format_amount_by_symbol($sum['end'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
         </td>
         <td class="text-end">
-            {{ format_amount_by_symbol(sum.difference, sum.currency_symbol, sum.currency_decimal_places) }}
+            {!! format_amount_by_symbol($sum['difference'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
         </td>
     </tr>
     @endforeach
diff --git a/resources/views/reports/partials/balance.blade.php b/resources/views/reports/partials/balance.blade.php
index deb030fd20..87e87714e3 100644
--- a/resources/views/reports/partials/balance.blade.php
+++ b/resources/views/reports/partials/balance.blade.php
@@ -2,10 +2,10 @@
     <thead>
     <tr>
         <th>{{ __('firefly.budgets') }}</th>
-        {% for account in report.accounts %}
+        @foreach($report['accounts'] as $account)
             {% if account.sum != 0 %}
-                <th class="text-right hidden-xs"><a href="{{ route('accounts.show',account.id) }}"
-                                                                    title="{{ account.iban|default(account.name) }}">{{ account.name }}</a></th>
+                <th class="text-right hidden-xs"><a href="{{ route('accounts.show',$account['id']) }}"
+                                                                    title="{{ $account['iban']|default($account['name']) }}">{{ $account['name'] }}</a></th>
             @endif
         @endforeach
         <th class="text-end">{{ __('firefly.sum') }}</th>
@@ -19,13 +19,13 @@
                 <td>
                     <a href="{{ route('budgets.show', [budget.budget_id]) }}">{{ budget.budget_name }}</a>
                 </td>
-                {% for account in report.accounts %}
+                @foreach($report['accounts'] as $account)
                     {% if budget.spent[$account->id] %}
                         <td class="text-end">
-                            {{ format_amount_by_symbol(budget.spent[$account->id].spent, budget.spent[$account->id].currency_symbol, budget.spent[$account->id].currency_decimal_places) }}
+                            {!! format_amount_by_symbol(budget.spent[$account->id].spent, budget.spent[$account->id].currency_symbol, budget.spent[$account->id].currency_decimal_places) }}
                             <span data-location="budget-entry"
                                data-budget-id="{{ budget.budget_id }}"
-                               data-account-id="{{ account.id }}"
+                               data-account-id="{{ $account['id'] }}"
                                data-currency-id="{{ budget.spent[$account->id].currency_id }}"
                                class="fa fa-info-circle text-muted firefly-info-button"></span>
                         </td>
@@ -38,7 +38,7 @@
                 @endforeach
                 <td class="text-end">
                     {% for sum in report.sums[budget.budget_id] %}
-                        {{ format_amount_by_symbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
                         <br/>
                     @endforeach
                 </td>
@@ -49,10 +49,10 @@
     <tfoot>
     <tr>
         <td><em>{{ __('firefly.sum') }}</em></td>
-        {% for account in report.accounts %}
+        @foreach($report['accounts'] as $account)
             {% if account.sum != 0 %}
                 <td class="text-end">
-                    {{ format_amount_by_symbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}
                 </td>
             @endif
         @endforeach
diff --git a/resources/views/reports/partials/bills.blade.php b/resources/views/reports/partials/bills.blade.php
index fd61c7716b..c6b02efd52 100644
--- a/resources/views/reports/partials/bills.blade.php
+++ b/resources/views/reports/partials/bills.blade.php
@@ -9,72 +9,76 @@
     </tr>
     </thead>
     <tbody>
-    {% for bill in report.bills %}
-        {% if (bill.expected_dates|length > 0 or bill.paid_moments|length > 0) and bill.active %}
+    @foreach($report['bills'] as $bill)
+        @if((count($bill['expected_dates']) > 0 || count($bill['paid_moments'])) > 0 && $bill['active'])
             <tr>
                 <td>
-                    <a href="{{ route('subscriptions.show',bill.id) }}">{{ bill.name }}</a>
+                    <a href="{{ route('subscriptions.show', [$bill['id']]) }}">{{ $bill['name'] }}</a>
                 </td>
                 <td class="hidden-xs text-right">
-                    {{ format_amount_by_symbol(bill.amount_min, bill.currency_symbol, bill.currency_decimal_places) }}
+                    {!! format_amount_by_symbol($bill['amount_min'], $bill['currency_symbol'], $bill['currency_decimal_places']) !!}
                 </td>
                 <td class="hidden-xs text-right">
-                    {{ format_amount_by_symbol(bill.amount_max, bill.currency_symbol, bill.currency_decimal_places) }}
+                    {!! format_amount_by_symbol($bill['amount_max'], $bill['currency_symbol'], $bill['currency_decimal_places']) !!}
                 </td>
-                <td data-value="{{ bill.expected_dates[0].format('Y-m-d')|default('0000-00-00') }}">
-                    {% for date in bill.expected_dates %}
-                        {{ date.isoFormat($monthAndDayFormat) }}<br/>
+                <td data-value="{{ $bill['expected_dates'][0]?->format('Y-m-d') }}">
+                    @foreach($bill['expected_dates'] as $date)
+                        {{ $date->isoFormat($monthAndDayFormat) }}<br/>
                     @endforeach
                 </td>
                 <td class="text-end">
-                    {% set hitCount = 0 %}
-                    {% for journals in bill.paid_moments %}
-                        {% for journal in journals %}
-                            {% set hitCount = hitCount+1 %}
-                            <a title="{{ journal.date.isoFormat($monthAndDayFormat) }}"
-                               href="{{ route('transactions.show', [journal.transaction_group_id]) }}">{{ journal.description }}</a>,
-                            {{ format_amount_by_symbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
+                    @php
+                        $hitCount = 0;
+                    @endphp
+                    @foreach($bill['paid_moments'] as $journals)
+                        @foreach($journals as $journal)
+                            @php
+                                $hitCount++;
+                            @endphp
+                            <a title="{{ $journal['date']->isoFormat($monthAndDayFormat) }}"
+                               href="{{ route('transactions.show', [$journal['transaction_group_id']]) }}">{{ $journal['description'] }}</a>,
+                            {!! format_amount_by_symbol($journal['amount'], $journal['currency_symbol'], $journal['currency_decimal_places']) !!}
                             <br/>
                         @endforeach
                     @endforeach
-                    {% if hitCount == 0 %}
-                        <em>{{ 'notCharged'|_ }}</em>
+                    @if(0 === $hitCount)
+                        <em>{{ __('firefly.notCharged') }}</em>
                     @endif
                 </td>
             </tr>
         @endif
     @endforeach
 
-
-    {% for line in bills.getBills %}
+    
+    @foreach($bills->getBills() as $line)
         <tr>
-            <td data-value="{{ line.getBill.name }}">
-                <a href="{{ route('subscriptions.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
+            <td data-value="{{ $line->getBill()->name }}">
+                <a href="{{ route('subscriptions.show',$line->getBill()->id) }}">{{ $line->getBill()->name }}</a>
                 <small class="text-muted"><br/>
-                    {{ trans('firefly.bill_expected_between', {start: line.getPayDate.isoFormat($monthAndDayFormat), end: line.getEndOfPayDate.isoFormat($monthAndDayFormat) }) }}
+                    {{ trans('firefly.bill_expected_between', ['start' => $line->getPayDate()->isoFormat($monthAndDayFormat), 'end' => $line->getEndOfPayDate()->isoFormat($monthAndDayFormat)]) }}
                 </small>
             </td>
-            <td class="text-right hidden-xs" data-value="{{ line.getMin }}">{{ formatAmountByCurrency(line.getCurrency, line.getMin) }}</td>
-            <td class="text-right hidden-xs" data-value="{{ line.getMax }}">{{ formatAmountByCurrency(line.getCurrency, line.getMax) }}</td>
+            <td class="text-right hidden-xs" data-value="{{ $line->getMin() }}">{!! format_amount_by_currency($line->getCurrency(), $line->getMin())  !!}</td>
+            <td class="text-right hidden-xs" data-value="{{ $line->getMax() }}">{!! format_amount_by_currency($line->getCurrency(), $line->getMax())  !!}</td>
 
             {{-- if bill is hit, show hit amount --}}
-            {% if line.isHit %}
-                <td data-value="{{ line.getAmount }}" class="text-end">
-                    <a href="{{ route('transactions.show', line.getTransactionJournalId) }}">
-                        {{ formatAmountByCurrency(line.getCurrency, line.getAmount) }}
+            @if($line->isHit())
+                <td data-value="{{ $line->getAmount() }}" class="text-end">
+                    <a href="{{ route('transactions.show', $line->getTransactionJournalId()) }}">
+                        {!! format_amount_by_currency($line->getCurrency(), $line->getAmount())  !!}
                     </a>
                 </td>
             @endif
             {{-- if not but is active, show "not yet charged --}}
-            {% if not line.isHit and line.isActive %}
-                <td data-value="0" class="bg-success">{{ 'notCharged'|_ }}</td>
+            @if(!$line->isHit() && $line->isActive())
+                <td data-value="0" class="bg-success">{{ __('firefly.notCharged') }}</td>
             @endif
-            {% if not line.isActive and not line.isHit %}
+            @if(!$line->isActive() && !$line->isHit())
                 <td data-value="-1">&nbsp;</td>
             @endif
-            <td data-value="{{ (line.getMax - line.getAmount) }}" class="text-right hidden-xs">
-                {% if line.isHit %}
-                    {{ formatAmountByCurrency(line.getCurrency, (line.getMax + line.getAmount)) }}
+            <td data-value="{{ ($line->getMax() - $line->getAmount()) }}" class="text-right hidden-xs">
+                @if($line->isHit())
+                    {!! format_amount_by_currency($line->getCurrency(), ($line->getMax() + $line->getAmount())) !!}
                 @endif
             </td>
         </tr>
diff --git a/resources/views/reports/partials/budget-period.blade.php b/resources/views/reports/partials/budget-period.blade.php
index e7dd60d6a1..ca19aac14a 100644
--- a/resources/views/reports/partials/budget-period.blade.php
+++ b/resources/views/reports/partials/budget-period.blade.php
@@ -5,7 +5,7 @@
         {% for period in periods %}
             <th data-defaultsign="_19" class="text-end">{{ period }}</th>
         @endforeach
-        <th data-defaultsign="_19" class="text-end">{{ 'average'|_ }}</th>
+        <th data-defaultsign="_19" class="text-end">{{ __('firefly.average') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.sum') }}</th>
     </tr>
     </thead>
@@ -25,20 +25,20 @@
             {% for key, period in periods %}
                 {% if(info.entries[key]) %}
                     <td data-value="{{ info.entries[key] }}" class="text-end">
-                        {{ format_amount_by_symbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }}
                     </td>
                 @else
                     <td data-value="0" class="text-end">
-                        {{ format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }}
                     </td>
                 @endif
 
             @endforeach
             <td data-value="{{ info.avg }}" class="text-end">
-                {{ format_amount_by_symbol(info.avg, info.currency_symbol, info.currency_decimal_places) }}
+                {!! format_amount_by_symbol(info.avg, info.currency_symbol, info.currency_decimal_places) }}
             </td>
             <td data-value="{{ info.sum }}" class="text-end">
-                {{ format_amount_by_symbol(info.sum, info.currency_symbol, info.currency_decimal_places) }}
+                {!! format_amount_by_symbol(info.sum, info.currency_symbol, info.currency_decimal_places) }}
             </td>
         </tr>
     @endforeach
diff --git a/resources/views/reports/partials/budgets.blade.php b/resources/views/reports/partials/budgets.blade.php
index 8ddcc6639f..a015b9f83b 100644
--- a/resources/views/reports/partials/budgets.blade.php
+++ b/resources/views/reports/partials/budgets.blade.php
@@ -39,7 +39,7 @@
                 <!-- budgeted, hidden on mobile -->
                 <td data-value="{{ budget_limit.budgeted|default(0) }}" class="text-right hidden-xs">
                     {% if null != budget_limit.budgeted %}
-                        {{ format_amount_by_symbol(budget_limit.budgeted, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(budget_limit.budgeted, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}
                     @endif
                 </td>
                 <!-- percentage, hidden -->
@@ -50,7 +50,7 @@
 
                 <!-- spent, visible on mobile -->
                 <td data-value="{{ budget_limit.spent|default(0) }}" class="text-end">
-                    {{ format_amount_by_symbol(budget_limit.spent, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(budget_limit.spent, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}
                 </td>
                 <!-- percentage, hidden -->
                 <td data-value="{{ budget_limit.spent_pct|default(0) }}" class="hidden-xs">
@@ -69,13 +69,13 @@
                 <!-- left, hidden on mobile  -->
                 <td data-value="{{ budget_limit.left|default(0) }}" class="text-right hidden-xs">
                     {% if null != budget_limit.left %}
-                        {{ format_amount_by_symbol(budget_limit.left, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(budget_limit.left, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}
                     @endif
                 </td>
                 <!-- overspent, visible. -->
                 <td data-value="{{ budget_limit.overspent|default(0) }}" class="text-end">
                     {% if null != budget_limit.overspent %}
-                        {{ format_amount_by_symbol(budget_limit.overspent, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(budget_limit.overspent, budget_limit.currency_symbol, budget_limit.currency_decimal_places) }}
                     @endif
                 </td>
             </tr>
@@ -86,13 +86,13 @@
     {% for sum in report.sums %}
         <tr>
             <td colspan="2"><em>{{ __('firefly.sum') }} ({{ sum.currency_name }})</em></td>
-            <td class="text-end">{{ format_amount_by_symbol(sum.budgeted, sum.currency_symbol, sum.currency_decimal_places) }}</td>
+            <td class="text-end">{!! format_amount_by_symbol(sum.budgeted, sum.currency_symbol, sum.currency_decimal_places) }}</td>
             <td>&nbsp;</td>
-            <td class="text-end">{{ format_amount_by_symbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}</td>
+            <td class="text-end">{!! format_amount_by_symbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
-            <td class="text-end">{{ format_amount_by_symbol(sum.left, sum.currency_symbol, sum.currency_decimal_places) }}</td>
-            <td class="text-end">{{ format_amount_by_symbol(sum.overspent, sum.currency_symbol, sum.currency_decimal_places) }}</td>
+            <td class="text-end">{!! format_amount_by_symbol(sum.left, sum.currency_symbol, sum.currency_decimal_places) }}</td>
+            <td class="text-end">{!! format_amount_by_symbol(sum.overspent, sum.currency_symbol, sum.currency_decimal_places) }}</td>
 
         </tr>
         @endforeach
diff --git a/resources/views/reports/partials/categories.blade.php b/resources/views/reports/partials/categories.blade.php
index 45cd9bfdcb..00911d2399 100644
--- a/resources/views/reports/partials/categories.blade.php
+++ b/resources/views/reports/partials/categories.blade.php
@@ -3,14 +3,14 @@
     <tr>
         <th data-defaultsign="az">{{ __('firefly.category') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.spent') }}</th>
-        <th data-defaultsign="_19" class="text-end">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" class="text-end">{{ __('firefly.earned') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.sum') }}</th>
         <th data-defaultsort="disabled">&nbsp;</th>
     </tr>
     </thead>
     <tbody>
     {% for category in report.categories %}
-        {% if loop.index > listLength %}
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
@@ -18,9 +18,9 @@
         <td data-value="{{ category.title }}">
             <a href="{{ route('categories.show', category.id) }}">{{ category.title }}</a>
         </td>
-        <td data-value="{{ category.spent }}" class="text-end">{{ format_amount_by_symbol(category.spent, category.currency_symbol, category.currency_decimal_places, true) }}</td>
-        <td data-value="{{ category.earned }}" class="text-end">{{ format_amount_by_symbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }}</td>
-        <td data-value="{{ category.sum }}" class="text-end">{{ format_amount_by_symbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }}</td>
+        <td data-value="{{ category.spent }}" class="text-end">{!! format_amount_by_symbol(category.spent, category.currency_symbol, category.currency_decimal_places, true) }}</td>
+        <td data-value="{{ category.earned }}" class="text-end">{!! format_amount_by_symbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }}</td>
+        <td data-value="{{ category.sum }}" class="text-end">{!! format_amount_by_symbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }}</td>
         <td class="twenty-px">
             <span class="fa fa-info-circle text-muted firefly-info-button" data-location="category-entry" data-category-id="{{ category.id }}" data-currency-id="{{ category.currency_id }}"
             ></span>
@@ -32,7 +32,7 @@
     {% if report.categories|length > listLength %}
         <tr>
             <td colspan="4" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
@@ -40,13 +40,13 @@
     <tr>
         <td><em>{{ __('firefly.sum') }} ({{ sum.currency_name }})</em></td>
         <td class="text-end">
-            {{ format_amount_by_symbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}
+            {!! format_amount_by_symbol(sum.spent, sum.currency_symbol, sum.currency_decimal_places) }}
         </td>
         <td class="text-end">
-            {{ format_amount_by_symbol(sum.earned, sum.currency_symbol, sum.currency_decimal_places) }}
+            {!! format_amount_by_symbol(sum.earned, sum.currency_symbol, sum.currency_decimal_places) }}
         </td>
         <td class="text-end">
-            {{ format_amount_by_symbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
+            {!! format_amount_by_symbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
         </td>
     </tr>
     @endforeach
diff --git a/resources/views/reports/partials/category-period.blade.php b/resources/views/reports/partials/category-period.blade.php
index c09e3a7dab..5ac178980a 100644
--- a/resources/views/reports/partials/category-period.blade.php
+++ b/resources/views/reports/partials/category-period.blade.php
@@ -25,11 +25,11 @@
                 {{-- income first --}}
                 {% if(info.entries[key]) %}
                     <td data-value="{{ info.entries[key] }}" class="text-end">
-                        {{ format_amount_by_symbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(info.entries[key], info.currency_symbol, info.currency_decimal_places) }}
                     </td>
                 @else
                     <td data-value="0" class="text-end">
-                        {{ format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }}
                     </td>
                 @endif
             @endforeach
@@ -37,11 +37,11 @@
             {{-- if sum of income, display: --}}
             {% if info.sum %}
                 <td data-value="{{ info.sum }}" class="text-end">
-                    {{ format_amount_by_symbol(info.sum, info.currency_symbol, info.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(info.sum, info.currency_symbol, info.currency_decimal_places) }}
                 </td>
             @else
                 <td data-value="0" class="text-end">
-                    {{ format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(0, info.currency_symbol, info.currency_decimal_places) }}
                 </td>
             @endif
         </tr>
diff --git a/resources/views/reports/partials/exp-budgets.blade.php b/resources/views/reports/partials/exp-budgets.blade.php
index 5297be80fc..1e61249081 100644
--- a/resources/views/reports/partials/exp-budgets.blade.php
+++ b/resources/views/reports/partials/exp-budgets.blade.php
@@ -20,7 +20,7 @@
                     {{ '0'|formatAmount }}
                 @else
                     {% for expense in entry.spent.per_currency %}
-                        {{ format_amount_by_symbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br/>
+                        {!! format_amount_by_symbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br/>
                     @endforeach
                 @endif
             </td>
diff --git a/resources/views/reports/partials/exp-categories.blade.php b/resources/views/reports/partials/exp-categories.blade.php
index 2fa689a13c..6fbce68e0b 100644
--- a/resources/views/reports/partials/exp-categories.blade.php
+++ b/resources/views/reports/partials/exp-categories.blade.php
@@ -3,7 +3,7 @@
     <tr>
         <th class="half" data-defaultsign="az" data-defaultsort="asc">{{ __('firefly.category') }}</th>
         <th class="quarter" data-defaultsign="_19">{{ __('firefly.spent') }}</th>
-        <th class="quarter" data-defaultsign="_19">{{ 'earned'|_ }}</th>
+        <th class="quarter" data-defaultsign="_19">{{ __('firefly.earned') }}</th>
     </tr>
     </thead>
     <tbody>
@@ -22,7 +22,7 @@
                     {{ '0'|formatAmount }}
                 @else
                     {% for expense in entry.spent.per_currency %}
-                        {{ format_amount_by_symbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br/>
+                        {!! format_amount_by_symbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br/>
                     @endforeach
                 @endif
             </td>
@@ -31,7 +31,7 @@
                     {{ '0'|formatAmount }}
                 @else
                     {% for income in entry.earned.per_currency %}
-                        {{ format_amount_by_symbol(income.sum * -1, income.currency.symbol, income.currency.dp) }}<br/>
+                        {!! format_amount_by_symbol(income.sum * -1, income.currency.symbol, income.currency.dp) }}<br/>
                     @endforeach
                 @endif
             </td>
diff --git a/resources/views/reports/partials/exp-not-grouped.blade.php b/resources/views/reports/partials/exp-not-grouped.blade.php
index e21120f956..af312d8fcc 100644
--- a/resources/views/reports/partials/exp-not-grouped.blade.php
+++ b/resources/views/reports/partials/exp-not-grouped.blade.php
@@ -3,7 +3,7 @@
     <tr>
         <th class="half" data-defaultsign="az">{{ __('firefly.name') }}</th>
         <th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ __('firefly.spent') }}</th>
-        <th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ 'earned'|_ }}</th>
+        <th class="quarter" class="hidden-xs" data-defaultsign="_19">{{ __('firefly.earned') }}</th>
     </tr>
     </thead>
     <tbody>
@@ -15,7 +15,7 @@
                     {{ '0'|formatAmount }}
                 @endif
                 {% for expense in amounts.spent.per_currency %}
-                    {{ format_amount_by_symbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br/>
+                    {!! format_amount_by_symbol(expense.sum, expense.currency.symbol, expense.currency.dp) }}<br/>
                 @endforeach
             </td>
             <td data-value="{{ amounts.earned.grand_sum }}">
@@ -23,7 +23,7 @@
                     {{ '0'|formatAmount }}
                 @endif
                 {% for income in amounts.earned.per_currency %}
-                    {{ format_amount_by_symbol(income.sum * -1, income.currency.symbol, income.currency.dp) }}<br/>
+                    {!! format_amount_by_symbol(income.sum * -1, income.currency.symbol, income.currency.dp) }}<br/>
                 @endforeach
             </td>
         </tr>
diff --git a/resources/views/reports/partials/income-expenses.blade.php b/resources/views/reports/partials/income-expenses.blade.php
index d64ce1baba..4cbdf28eb0 100644
--- a/resources/views/reports/partials/income-expenses.blade.php
+++ b/resources/views/reports/partials/income-expenses.blade.php
@@ -3,57 +3,57 @@
     <tr>
         <th data-defaultsign="az">{{ __('firefly.name') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.total') }}</th>
-        <th data-defaultsign="_19" class="text-right hidden-xs">{{ 'average'|_ }}</th>
+        <th data-defaultsign="_19" class="text-right hidden-xs">{{ __('firefly.average') }}</th>
         <th data-defaultsort="disabled"></th>
     </tr>
     </thead>
     <tbody>
-    {% for account in report.accounts %}
-        {% if loop.index > listLength %}
+    @foreach($report['accounts'] as $account)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
-        <td data-value="{{ account.name }}">
-            <a href="{{ route('accounts.show',account.id) }}">{{ account.name }}</a>
-            {% if account.count > 1 %}
+        <td data-value="{{ $account['name'] }}">
+            <a href="{{ route('accounts.show',$account['id']) }}">{{ $account['name'] }}</a>
+            @if($account['count'] > 1)
                 <br/>
                 <small>
-                    {{ account.count }} {{ 'transactions'|_|lower }}
+                    {{ $account['count'] }} {{ strtolower(__('transactions')) }}
                 </small>
             @endif
         </td>
-        <td data-value="{{ account.sum }}" class="text-end">
-            {{ format_amount_by_symbol(account.sum, account.currency_symbol, account.currency_decimal_places) }}
+        <td data-value="{{ $account['sum'] }}" class="text-end">
+            {!! format_amount_by_symbol($account['sum'], $account['currency_symbol'], $account['currency_decimal_places']) !!}
         </td>
-        <td class="text-right hidden-xs" data-value="{{ account.average }}">
-            {% if account.count > 1 %}
-                {{ format_amount_by_symbol(account.average, account.currency_symbol, account.currency_decimal_places) }}
+        <td class="text-right hidden-xs" data-value="{{ $account['average'] }}">
+            @if($account['count'] > 1)
+                {!! format_amount_by_symbol($account['average'], $account['currency_symbol'], $account['currency_decimal_places']) !!}
             @else
                 &mdash;
             @endif
         </td>
         <td>
-            <span class="fa text-muted fa-info-circle firefly-info-button" data-location="{{ type }}"
-               data-account-id="{{ account.id }}" data-currency-id="{{ account.currency_id }}"></span>
+            <span class="bi bi-info-circle text-muted firefly-info-button" data-location="{{ $type }}"
+               data-account-id="{{ $account['id'] }}" data-currency-id="{{ $account['currency_id'] }}"></span>
         </td>
         </tr>
     @endforeach
     </tbody>
 
     <tfoot>
-    {% if report.accounts|length > listLength %}
+    @if(count($report['accounts']) >$listLength)
         <tr>
             <td colspan="4" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list', {number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list', ['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
-    {% for sum in report.sums %}
+    @foreach($report['sums'] as $sum)
         <tr>
-            <td><em>{{ __('firefly.sum') }} ({{ sum.currency_name }})</em></td>
+            <td><em>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }})</em></td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol($sum['sum'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
             </td>
             <td>&nbsp;</td>
         </tr>
diff --git a/resources/views/reports/partials/journals-audit.blade.php b/resources/views/reports/partials/journals-audit.blade.php
index 872c3110ff..f5db2cb2bf 100644
--- a/resources/views/reports/partials/journals-audit.blade.php
+++ b/resources/views/reports/partials/journals-audit.blade.php
@@ -79,38 +79,38 @@
             </td>
 
             <td class="text-right hide-balance_before">
-                {{ format_amount_by_symbol(journal.balance_before, auditData[$account->id].currency.symbol, auditData[$account->id].currency.decimal_places) }}
+                {!! format_amount_by_symbol(journal.balance_before, auditData[$account->id].currency.symbol, auditData[$account->id].currency.decimal_places) }}
             </td>
             <td class="text-right hide-amount">
 
                 {% if auditData[$account->id].currency.id == journal.currency_id %}
-                    {% if account.id == journal.destination_account_id and journal.transaction_type_type == 'Opening balance' %}
-                        {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
-                    {% elseif account.id == journal.destination_account_id and journal.transaction_type_type == 'Deposit' %}
-                        {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
-                    {% elseif account.id == journal.destination_account_id and journal.transaction_type_type == 'Transfer' %}
-                        {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
+                    {% if $account['id'] == journal.destination_account_id and journal.transaction_type_type == 'Opening balance' %}
+                        {!! format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
+                    {% elseif $account['id'] == journal.destination_account_id and journal.transaction_type_type == 'Deposit' %}
+                        {!! format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
+                    {% elseif $account['id'] == journal.destination_account_id and journal.transaction_type_type == 'Transfer' %}
+                        {!! format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
                     @else
-                        {{ format_amount_by_symbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
+                        {!! format_amount_by_symbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
                     @endif
                 @endif
 
                 {% if auditData[$account->id].currency.id == journal.foreign_currency_id %}
-                    {% if account.id == journal.destination_account_id and journal.transaction_type_type == 'Opening balance' %}
-                        {{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }}
-                    {% elseif account.id == journal.destination_account_id and journal.transaction_type_type == 'Deposit' %}
-                        {{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }}
-                    {% elseif account.id == journal.destination_account_id and journal.transaction_type_type == 'Transfer' %}
-                        {{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }}
+                    {% if $account['id'] == journal.destination_account_id and journal.transaction_type_type == 'Opening balance' %}
+                        {!! format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }}
+                    {% elseif $account['id'] == journal.destination_account_id and journal.transaction_type_type == 'Deposit' %}
+                        {!! format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }}
+                    {% elseif $account['id'] == journal.destination_account_id and journal.transaction_type_type == 'Transfer' %}
+                        {!! format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }}
                     @else
-                        {{ format_amount_by_symbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }}
+                        {!! format_amount_by_symbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }}
                     @endif
                 @endif
 
             </td>
 
             <td class="text-right hide-balance_after">
-                {{ format_amount_by_symbol(journal.balance_after, auditData[$account->id].currency.symbol, auditData[$account->id].currency.decimal_places) }}
+                {!! format_amount_by_symbol(journal.balance_after, auditData[$account->id].currency.symbol, auditData[$account->id].currency.decimal_places) }}
             </td>
 
             <td class="hide-date">{{ journal.date.isoFormat($monthAndDayFormat) }}</td>
diff --git a/resources/views/reports/partials/operations.blade.php b/resources/views/reports/partials/operations.blade.php
index 8a6c843fe4..a60f0cf039 100644
--- a/resources/views/reports/partials/operations.blade.php
+++ b/resources/views/reports/partials/operations.blade.php
@@ -1,24 +1,24 @@
 <table class="table table-hover sortable">
     <thead>
     <tr>
-        <th data-defaultsign="az">{{'currency'|_}}</th>
-        <th data-defaultsign="_19">{{ 'money_flowing_in'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'money_flowing_out'|_ }}</th>
-        <th data-defaultsign="_19">{{ 'difference'|_ }}</th>
+        <th data-defaultsign="az">{{ __('firefly.currency') }}</th>
+        <th data-defaultsign="_19">{{ __('firefly.money_flowing_in')}}</th>
+        <th data-defaultsign="_19">{{ __('firefly.money_flowing_out') }}</th>
+        <th data-defaultsign="_19">{{ __('firefly.difference') }}</th>
     </tr>
     </thead>
     <tbody>
-    {% for sum in sums %}
+    @foreach($sums as $sum)
     <tr>
-        <td>{{ sum.currency_name }} ({{ sum.currency_symbol }})</td>
-        <td data-value="{{ sum.in }}">
-            {{ format_amount_by_symbol(sum.in, sum.currency_symbol, sum.currency_decimal_places) }}
+        <td>{{ $sum['currency_name'] }} ({{ $sum['currency_symbol'] }})</td>
+        <td data-value="{{ $sum['in'] }}">
+            {!! format_amount_by_symbol($sum['in'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
         </td>
-        <td data-value="{{ sum.out }}">
-            {{ format_amount_by_symbol(sum.out, sum.currency_symbol, sum.currency_decimal_places) }}
+        <td data-value="{{ $sum['out'] }}">
+            {!! format_amount_by_symbol($sum['out'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
         </td>
-        <td data-value="{{ sum.sum }}">
-            {{ format_amount_by_symbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
+        <td data-value="{{ $sum['sum'] }}">
+            {!! format_amount_by_symbol($sum['sum'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
         </td>
     </tr>
     @endforeach
diff --git a/resources/views/reports/partials/top-transactions.blade.php b/resources/views/reports/partials/top-transactions.blade.php
index 1d29b367b1..cd893c1252 100644
--- a/resources/views/reports/partials/top-transactions.blade.php
+++ b/resources/views/reports/partials/top-transactions.blade.php
@@ -21,9 +21,9 @@
             <td class="text-end" data-value="{{ transaction.amount}}"><span
                         class="mr-2">
 
-                    {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                     {% if null != transaction.foreign_amount %}
-                        ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                        ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                     @endif
                 </span></td>
         </tr>
diff --git a/resources/views/reports/tag/month.blade.php b/resources/views/reports/tag/month.blade.php
index a28cf15737..8f46f57220 100644
--- a/resources/views/reports/tag/month.blade.php
+++ b/resources/views/reports/tag/month.blade.php
@@ -15,7 +15,7 @@
                 <div class="card-body p-0" id="accountsHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -30,7 +30,7 @@
                 <div class="card-body p-0" id="tagsHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -47,7 +47,7 @@
                 <div class="card-body p-0" id="accountPerTagHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -97,7 +97,7 @@
         <div class="col-lg-4 col-md-6">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income_per_category'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.income_per_category') }}</h3>
                 </div>
                 <div class="card-body">
                     <div class="center-chart">
@@ -109,7 +109,7 @@
         <div class="col-lg-4 col-md-6">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'expense_per_budget'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.expense_per_budget') }}</h3>
                 </div>
                 <div class="card-body">
                     <div class="center-chart">
@@ -135,7 +135,7 @@
         <div class="col-lg-6 col-md-6">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income_per_source_account'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.income_per_source_account') }}</h3>
                 </div>
                 <div class="card-body">
                     <div class="center-chart">
@@ -161,7 +161,7 @@
         <div class="col-lg-6 col-md-6">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income_per_destination_account'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.income_per_destination_account') }}</h3>
                 </div>
                 <div class="card-body">
                     <div class="center-chart">
@@ -177,7 +177,7 @@
             <div class="col-lg-12">
                 <div class="box main_budget_chart">
                     <div class="card-header">
-                        <h3 class="card-title">{{ 'income_and_expenses'|_ }} ({{ tag.tag }})</h3>
+                        <h3 class="card-title">{{ __('firefly.income_and_expenses') }} ({{ tag.tag }})</h3>
                     </div>
                     <div class="card-body">
                         <canvas class="main_tag_canvas"
@@ -195,12 +195,12 @@
         <div class="col-lg-6">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'average_spending_per_destination'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.average_spending_per_destination') }}</h3>
                 </div>
                 <div class="card-body p-0" id="avgExpensesHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -210,12 +210,12 @@
         <div class="col-lg-6">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'average_earning_per_source'|_ }}</h3>
+                    <h3 class="card-title">{{ __('firefly.average_earning_per_source') }}</h3>
                 </div>
                 <div class="card-body p-0" id="avgIncomeHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -227,12 +227,12 @@
         <div class="col-lg-6">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ __('firefly.expenses') }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    <h3 class="card-title">{{ __('firefly.expenses') }} ({{ trans('firefly.topX', ['number' => $listLength]) }})</h3>
                 </div>
                 <div class="card-body p-0" id="topExpensesHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
@@ -242,12 +242,12 @@
         <div class="col-lg-6">
             <div class="card">
                 <div class="card-header">
-                    <h3 class="card-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+                    <h3 class="card-title">{{ __('firefly.income') }} ({{ trans('firefly.topX', ['number' => $listLength]) }})</h3>
                 </div>
                 <div class="card-body p-0" id="topIncomeHolder">
                 </div>
                 {{-- loading indicator --}}
-                <div class="overlay">
+                <div class="overlay text-center m-2">
                     <div class="spinner-border spinner-border-sm" role="status">
   <span class="visually-hidden">Loading...</span>
 </div>
diff --git a/resources/views/reports/tag/partials/account-per-tag.blade.php b/resources/views/reports/tag/partials/account-per-tag.blade.php
index b0767fd2b3..9efebfe040 100644
--- a/resources/views/reports/tag/partials/account-per-tag.blade.php
+++ b/resources/views/reports/tag/partials/account-per-tag.blade.php
@@ -8,17 +8,17 @@
     </tr>
     </thead>
     <tbody>
-    {% for account in report %}
-        {% for currency in account.currencies %}
+    @foreach($report as $account)
+        @foreach($account['currencies'] as $currency)
             <tr>
-                <td data-value="{{ account.name }} ({{ currency.currency_name }})">
-                    <a href="{{ route('accounts.show', account.id) }}" title="{{ account.iban }}">{{ account.name }} ({{ currency.currency_name }})</a>
+                <td data-value="{{ $account['name'] }} ({{ $currency['currency_name'] }})">
+                    <a href="{{ route('accounts.show', account.id) }}" title="{{ $account['iban'] }}">{{ $account['name'] }} ({{ $currency['currency_name'] }})</a>
                 </td>
                 {% for tag in tags %}
                     <td class="text-end">
                         {% if currency.tags[tag.id] %}
-                            <span title="{{ 'earned'|_ }}: {{ format_amount_by_symbol(currency.tags[tag.id].earned, currency.currency_symbol, currency.currency_decimal_places, false) }}, {{ __('firefly.spent') }}: {{ format_amount_by_symbol(currency.tags[tag.id].spent, currency.currency_symbol, currency.currency_decimal_places, false) }}"
-                            {{ format_amount_by_symbol(currency.tags[tag.id].sum, currency.currency_symbol, currency.currency_decimal_places) }}
+                            <span title="{{ __('firefly.earned') }}: {!! format_amount_by_symbol(currency.tags[tag.id].earned, currency.currency_symbol, currency.currency_decimal_places, false) }}, {{ __('firefly.spent') }}: {!! format_amount_by_symbol(currency.tags[tag.id].spent, currency.currency_symbol, currency.currency_decimal_places, false) }}"
+                            {!! format_amount_by_symbol(currency.tags[tag.id].sum, currency.currency_symbol, currency.currency_decimal_places) }}
                         @else
                             &mdash;
                         @endif
diff --git a/resources/views/reports/tag/partials/accounts.blade.php b/resources/views/reports/tag/partials/accounts.blade.php
index 5c7dddf5b7..c527b9a233 100644
--- a/resources/views/reports/tag/partials/accounts.blade.php
+++ b/resources/views/reports/tag/partials/accounts.blade.php
@@ -3,25 +3,25 @@
     <tr>
         <th data-defaultsign="az">{{ __('firefly.name') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.spent') }}</th>
-        <th data-defaultsign="_19" class="text-end">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" class="text-end">{{ __('firefly.earned') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.sum') }}</th>
     </tr>
     </thead>
     <tbody>
-    {% for account in report %}
-        {% for currency in account.currencies %}
+    @foreach($report as $account)
+        @foreach($account['currencies'] as $currency)
             <tr>
-                <td data-value="{{ account.name }} ({{ currency.currency_name }})">
-                    <a href="{{ route('accounts.show', account.id) }}" title="{{ account.iban }}">{{ account.name }} ({{ currency.currency_name }})</a>
+                <td data-value="{{ $account['name'] }} ({{ $currency['currency_name'] }})">
+                    <a href="{{ route('accounts.show', account.id) }}" title="{{ $account['iban'] }}">{{ $account['name'] }} ({{ $currency['currency_name'] }})</a>
                 </td>
                 <td data-value="{{ currency.spent }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.spent, currency.currency_symbol, currency.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(currency.spent, currency.currency_symbol, currency.currency_decimal_places) }}
                 </td>
                 <td data-value="{{ currency.earned }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.earned, currency.currency_symbol, currency.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(currency.earned, currency.currency_symbol, currency.currency_decimal_places) }}
                 </td>
                 <td data-value="{{ currency.sum }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}
                 </td>
             </tr>
         @endforeach
@@ -32,13 +32,13 @@
         <tr>
             <td>{{ __('firefly.sum') }} ({{ sum.currency_name }})</td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.spent_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.spent_sum, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.earned_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.earned_sum, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.total_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.total_sum, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
         </tr>
     @endforeach
diff --git a/resources/views/reports/tag/partials/avg-expenses.blade.php b/resources/views/reports/tag/partials/avg-expenses.blade.php
index c84107c088..a815a04017 100644
--- a/resources/views/reports/tag/partials/avg-expenses.blade.php
+++ b/resources/views/reports/tag/partials/avg-expenses.blade.php
@@ -8,37 +8,37 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.destination_account_id) }}">
-                {{ row.destination_account_name }}
+            <a href="{{ route('accounts.show', $row['destination_account_id']) }}">
+                {{ $row['destination_account_name'] }}
             </a>
         </td>
-        <td data-value="{{ row.avg }}" class="text-end">
-            {{ format_amount_by_symbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['avg'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['avg'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
-        <td data-value="{{ row.sum }}" class="text-end">
-            {{ format_amount_by_symbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['sum'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['sum'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
-        <td data-value="{{ row.transactions }}">
-            {{ row.transactions }}
+        <td data-value="{{ $row['transactions'] }}">
+            {{ $row['transactions'] }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/tag/partials/avg-income.blade.php b/resources/views/reports/tag/partials/avg-income.blade.php
index 58767c7283..bb66c4c3c7 100644
--- a/resources/views/reports/tag/partials/avg-income.blade.php
+++ b/resources/views/reports/tag/partials/avg-income.blade.php
@@ -8,37 +8,37 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.source_account_id) }}">
-                {{ row.source_account_name }}
+            <a href="{{ route('accounts.show', $row['source_account_id']) }}">
+                {{ row['source_account_name'] }}
             </a>
         </td>
-        <td data-value="{{ row.avg }}" class="text-end">
-            {{ format_amount_by_symbol(row.avg, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['avg'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['avg'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
-        <td data-value="{{ row.sum }}" class="text-end">
-            {{ format_amount_by_symbol(row.sum, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['sum'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['sum'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
-        <td data-value="{{ row.transactions }}">
-            {{ row.transactions }}
+        <td data-value="{{ $row['transactions'] }}">
+            {{ $row['transactions'] }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/tag/partials/tags.blade.php b/resources/views/reports/tag/partials/tags.blade.php
index a235ad8d71..c6e4f08fa0 100644
--- a/resources/views/reports/tag/partials/tags.blade.php
+++ b/resources/views/reports/tag/partials/tags.blade.php
@@ -3,7 +3,7 @@
     <tr>
         <th data-defaultsign="az">{{ __('firefly.name') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.spent') }}</th>
-        <th data-defaultsign="_19" class="text-end">{{ 'earned'|_ }}</th>
+        <th data-defaultsign="_19" class="text-end">{{ __('firefly.earned') }}</th>
         <th data-defaultsign="_19" class="text-end">{{ __('firefly.sum') }}</th>
     </tr>
     </thead>
@@ -21,17 +21,17 @@
         @endif
         {% for currency in tag.currencies %}
             <tr>
-                <td data-value="{{ tag.name }} ({{ currency.currency_name }})">
-                    <a href="{{ route('tags.show', [tag.id]) }}" title="{{ tag.name }}">{{ tag.name }} ({{ currency.currency_name }})</a>
+                <td data-value="{{ tag.name }} ({{ $currency['currency_name'] }})">
+                    <a href="{{ route('tags.show', [tag.id]) }}" title="{{ tag.name }}">{{ tag.name }} ({{ $currency['currency_name'] }})</a>
                 </td>
                 <td data-value="{{ currency.spent }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.spent, currency.currency_symbol, currency.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(currency.spent, currency.currency_symbol, currency.currency_decimal_places) }}
                 </td>
                 <td data-value="{{ currency.earned }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.earned, currency.currency_symbol, currency.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(currency.earned, currency.currency_symbol, currency.currency_decimal_places) }}
                 </td>
                 <td data-value="{{ currency.sum }}" class="text-end">
-                    {{ format_amount_by_symbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}
+                    {!! format_amount_by_symbol(currency.sum, currency.currency_symbol, currency.currency_decimal_places) }}
                 </td>
             </tr>
         @endforeach
@@ -42,13 +42,13 @@
         <tr>
             <td>{{ __('firefly.sum') }} ({{ sum.currency_name }})</td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.spent_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.spent_sum, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.earned_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.earned_sum, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
             <td class="text-end">
-                {{ format_amount_by_symbol(sum.total_sum, sum.currency_symbol, sum.currency_decimal_places) }}
+                {!! format_amount_by_symbol(sum.total_sum, sum.currency_symbol, sum.currency_decimal_places) }}
             </td>
         </tr>
     @endforeach
diff --git a/resources/views/reports/tag/partials/top-expenses.blade.php b/resources/views/reports/tag/partials/top-expenses.blade.php
index a8f8b60336..04a3b88d71 100644
--- a/resources/views/reports/tag/partials/top-expenses.blade.php
+++ b/resources/views/reports/tag/partials/top-expenses.blade.php
@@ -9,24 +9,24 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('transactions.show', row.transaction_group_id) }}">
-                {{ row.description }}
+            <a href="{{ route('transactions.show', $row['transaction_group_id']) }}">
+                {{ $row['description'] }}
             </a>
         </td>
-        <td data-value="{{ row.date_sort }}">
-            {{ row.date }}
+        <td data-value="{{ $row['date_sort'] }}">
+            {{ $row['date'] }}
         </td>
 
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.destination_account_id) }}">
-                {{ row.destination_account_name }}
+            <a href="{{ route('accounts.show', $row['destination_account_id']) }}">
+                {{ $row['destination_account_name'] }}
             </a>
         </td>
         <td data-sortable="false">
@@ -35,18 +35,18 @@
             </a>
         </td>
 
-        <td data-value="{{ row.amount }}" class="text-end">
-            {{ format_amount_by_symbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['amount'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['amount'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/reports/tag/partials/top-income.blade.php b/resources/views/reports/tag/partials/top-income.blade.php
index 24eca57f9a..f1904d7e02 100644
--- a/resources/views/reports/tag/partials/top-income.blade.php
+++ b/resources/views/reports/tag/partials/top-income.blade.php
@@ -9,24 +9,24 @@
     </tr>
     </thead>
     <tbody>
-    {% for row in result %}
-        {% if loop.index > listLength %}
+    @foreach($result as $row)
+        @if($loop->index > $listLength)
             <tr class="overListLength">
         @else
             <tr>
         @endif
         <td data-sortable="false">
-            <a href="{{ route('transactions.show', row.transaction_group_id) }}">
-                {{ row.description }}
+            <a href="{{ route('transactions.show', $row['transaction_group_id']) }}">
+                {{ $row['description'] }}
             </a>
         </td>
-        <td data-value="{{ row.date_sort }}">
-            {{ row.date }}
+        <td data-value="{{ $row['date_sort'] }}">
+            {{ $row['date'] }}
         </td>
 
         <td data-sortable="false">
-            <a href="{{ route('accounts.show', row.source_account_id) }}">
-                {{ row.source_account_name }}
+            <a href="{{ route('accounts.show', $row['source_account_id']) }}">
+                {{ row['source_account_name'] }}
             </a>
         </td>
         <td data-sortable="false">
@@ -35,18 +35,18 @@
             </a>
         </td>
 
-        <td data-value="{{ row.amount }}" class="text-end">
-            {{ format_amount_by_symbol(row.amount, row.currency_symbol, row.currency_decimal_places) }}
+        <td data-value="{{ $row['amount'] }}" class="text-end">
+            {!! format_amount_by_symbol($row['amount'], $row['currency_symbol'], $row['currency_decimal_places']) }}
         </td>
 
         </tr>
     @endforeach
     </tbody>
     <tfoot>
-    {% if result|length > listLength %}
+    @if(count($result) > $listLength)
         <tr>
             <td colspan="5" class="active">
-                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
+                <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',['number' => $incomeTopLength]) }}</a>
             </td>
         </tr>
     @endif
diff --git a/resources/views/tags/show.blade.php b/resources/views/tags/show.blade.php
index 6b12e03278..a19bded3db 100644
--- a/resources/views/tags/show.blade.php
+++ b/resources/views/tags/show.blade.php
@@ -59,7 +59,7 @@
                                 <td class="forty">{{ trans('list.sum') }}</td>
                                 <td>
                                     {% for set in sums %}
-                                        {{ format_amount_by_symbol(set.Withdrawal + set.Transfer + set.Deposit, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
+                                        {!! format_amount_by_symbol(set.Withdrawal + set.Transfer + set.Deposit, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
                                     @endforeach
                                 </td>
                             </tr>
@@ -75,7 +75,7 @@
                                 <td class="forty">{{ trans('list.sum_excluding_transfers') }}</td>
                                 <td>
                                     {% for set in sums %}
-                                        {{ format_amount_by_symbol(set.Withdrawal + set.Deposit, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
+                                        {!! format_amount_by_symbol(set.Withdrawal + set.Deposit, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
                                     @endforeach
                                 </td>
                             </tr>
@@ -91,7 +91,7 @@
                                 <td class="forty">{{ trans('list.sum_withdrawals') }}</td>
                                 <td>
                                     {% for set in sums %}
-                                        {{ format_amount_by_symbol(set.Withdrawal, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
+                                        {!! format_amount_by_symbol(set.Withdrawal, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
                                     @endforeach
                                 </td>
                             </tr>
@@ -107,7 +107,7 @@
                                 <td class="forty">{{ trans('list.sum_deposits') }}</td>
                                 <td>
                                     {% for set in sums %}
-                                        {{ format_amount_by_symbol(set.Deposit, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
+                                        {!! format_amount_by_symbol(set.Deposit, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
                                     @endforeach
                                 </td>
                             </tr>
@@ -123,7 +123,7 @@
                                 <td class="forty">{{ trans('list.sum_transfers') }}</td>
                                 <td>
                                     {% for set in sums %}
-                                        {{ format_amount_by_symbol(set.Transfer, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
+                                        {!! format_amount_by_symbol(set.Transfer, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
                                     @endforeach
                                 </td>
                             </tr>
@@ -139,7 +139,7 @@
                                 <td class="forty">{{ trans('list.sum_reconciliations') }}</td>
                                 <td>
                                     {% for set in sums %}
-                                        {{ format_amount_by_symbol(set.Reconciliation, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
+                                        {!! format_amount_by_symbol(set.Reconciliation, set.currency_symbol, set.currency_decimal_places, true) }}{% if loop.index != sums|length %},@endif
                                     @endforeach
                                 </td>
                             </tr>
diff --git a/resources/views/transactions/bulk/edit.blade.php b/resources/views/transactions/bulk/edit.blade.php
index f1c0b384d0..43ec217e13 100644
--- a/resources/views/transactions/bulk/edit.blade.php
+++ b/resources/views/transactions/bulk/edit.blade.php
@@ -43,21 +43,21 @@
                                                     {{ journal.description }}</a></td>
                                             <td>
                                                 {% if journal.transaction_type_type == 'Deposit' %}
-                                                    {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
+                                                    {!! format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
                                                     {% if null != journal.foreign_amount %}
-                                                        ({{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
+                                                        ({!! format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
                                                     @endif
                                                 {% elseif journal.transaction_type_type == 'Transfer' %}
                                                     <span class="text-info money-transfer">
-                                                        {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                                                        {!! format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
                                                         {% if null != journal.foreign_amount %}
-                                                            ({{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                                                            ({!! format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
                                                         @endif
                                                     </span>
                                                 @else
-                                                    {{ format_amount_by_symbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
+                                                    {!! format_amount_by_symbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
                                                     {% if null != journal.foreign_amount %}
-                                                        ({{ format_amount_by_symbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
+                                                        ({!! format_amount_by_symbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
                                                     @endif
                                                 @endif
 
diff --git a/resources/views/transactions/convert.blade.php b/resources/views/transactions/convert.blade.php
index d658028bec..4656447e35 100644
--- a/resources/views/transactions/convert.blade.php
+++ b/resources/views/transactions/convert.blade.php
@@ -260,19 +260,19 @@
                                     </td>
                                     <td>
                                         {% if transaction.transaction_type_type == 'Deposit' %}
-                                            {{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                                            {!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}
                                             {% if null != transaction.foreign_amount %}
-                                                ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                                                ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                                             @endif
                                         {% elseif transaction.transaction_type_type == 'Transfer' %}
-                                            <span class="text-info money-transfer">{{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
+                                            <span class="text-info money-transfer">{!! format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places, false) }}
                                                 {% if null != transaction.foreign_amount %}
-                                                    ({{ format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
+                                                    ({!! format_amount_by_symbol(transaction.foreign_amount*-1, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places, false) }})
                                                 @endif</span>
                                         @else
-                                            {{ format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
+                                            {!! format_amount_by_symbol(transaction.amount, transaction.currency_symbol, transaction.currency_decimal_places) }}
                                             {% if null != transaction.foreign_amount %}
-                                                ({{ format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
+                                                ({!! format_amount_by_symbol(transaction.foreign_amount, transaction.foreign_currency_symbol, transaction.foreign_currency_decimal_places) }})
                                             @endif
                                         @endif
                                     </td>
diff --git a/resources/views/transactions/mass/delete.blade.php b/resources/views/transactions/mass/delete.blade.php
index dda88e501b..05441542fa 100644
--- a/resources/views/transactions/mass/delete.blade.php
+++ b/resources/views/transactions/mass/delete.blade.php
@@ -65,20 +65,20 @@
                                     </td>
                                     <td>
                                         {% if journal.transaction_type_type == 'Deposit' %}
-                                            {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
+                                            {!! format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
                                             {% if null != journal.foreign_amount %}
-                                                ({{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
+                                                ({!! format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
                                             @endif
                                         {% elseif journal.transaction_type_type == 'Transfer' %}
-                                            <span class="text-info money-transfer">{{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                                            <span class="text-info money-transfer">{!! format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
                                                 {% if null != journal.foreign_amount %}
-                                                    ({{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                                                    ({!! format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
                                                 @endif
                                             </span>
                                         @else
-                                            {{ format_amount_by_symbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
+                                            {!! format_amount_by_symbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
                                             {% if null != journal.foreign_amount %}
-                                                ({{ format_amount_by_symbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
+                                                ({!! format_amount_by_symbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
                                             @endif
                                         @endif
                                     </td>
diff --git a/resources/views/transactions/mass/edit.blade.php b/resources/views/transactions/mass/edit.blade.php
index b1ed8a36ad..9767c2af81 100644
--- a/resources/views/transactions/mass/edit.blade.php
+++ b/resources/views/transactions/mass/edit.blade.php
@@ -69,21 +69,21 @@
                                         <span class="text-sm">
                                         {% if journal.reconciled != false %}
                                             {% if journal.transaction_type_type == 'Deposit' %}
-                                                {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
+                                                {!! format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places) }}
                                                 {% if null != journal.foreign_amount %}
-                                                    ({{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
+                                                    ({!! format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
                                                 @endif
                                             {% elseif journal.transaction_type_type == 'Transfer' %}
                                                 <span class="text-info money-transfer">
-                        {{ format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                        {!! format_amount_by_symbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
                                                     {% if null != journal.foreign_amount %}
-                                                        ({{ format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                                                        ({!! format_amount_by_symbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
                                                     @endif
                                                 </span>
                                             @else
-                                                {{ format_amount_by_symbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
+                                                {!! format_amount_by_symbol(journal.amount, journal.currency_symbol, journal.currency_decimal_places) }}
                                                 {% if null != journal.foreign_amount %}
-                                                    ({{ format_amount_by_symbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
+                                                    ({!! format_amount_by_symbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places) }})
                                                 @endif
                                             @endif
                                         @endif
diff --git a/resources/views/transactions/old-index.blade.php b/resources/views/transactions/old-index.blade.php
index 78c5856851..78f0ae3c6f 100644
--- a/resources/views/transactions/old-index.blade.php
+++ b/resources/views/transactions/old-index.blade.php
@@ -23,7 +23,7 @@
             <div class="{{ boxSize }}">
                 <div class="card">
                     <div class="card-header">
-                        <h3 class="card-title">{{ 'categories'|_ }}</h3>
+                        <h3 class="card-title">{{ __('firefly.categories') }}</h3>
                     </div>
                     <div class="card-body">
                         <canvas id="category_chart" class="medium-chart" height="250"></canvas>