diff --git a/app/Generator/Webhook/StandardMessageGenerator.php b/app/Generator/Webhook/StandardMessageGenerator.php
index f2840bfc25..7695afd82a 100644
--- a/app/Generator/Webhook/StandardMessageGenerator.php
+++ b/app/Generator/Webhook/StandardMessageGenerator.php
@@ -35,7 +35,6 @@ use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Models\WebhookResponse as WebhookResponseModel;
-use FireflyIII\Models\WebhookTrigger as WebhookTriggerModel;
 use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment;
 use FireflyIII\Support\JsonApi\Enrichments\BudgetEnrichment;
 use FireflyIII\Support\JsonApi\Enrichments\BudgetLimitEnrichment;
diff --git a/app/Helpers/Functions/helpers.php b/app/Helpers/Functions/helpers.php
index 46ffe93e2c..7493feac55 100644
--- a/app/Helpers/Functions/helpers.php
+++ b/app/Helpers/Functions/helpers.php
@@ -55,24 +55,24 @@ if (!function_exists('env_default_when_empty')) {
     }
 }
 
-if(!function_exists('parseMarkdown')) {
-    function parseMarkdown(string $string): string {
+if(!function_exists('parse_markdown')) {
+    function parse_markdown(string $string): string {
         $converter = new GithubFlavoredMarkdownConverter(['allow_unsafe_links' => false, 'max_nesting_level' => 5, 'html_input' => 'escape']);
 
         return (string) $converter->convert($string);
     }
 }
 
-if(!function_exists('getRootSearchOperator')) {
-    function getRootSearchOperator(string $operator): string {
+if(!function_exists('get_root_search_operator')) {
+    function get_root_search_operator(string $operator): string {
         $result = OperatorQuerySearch::getRootOperator($operator);
 
         return str_replace('-', 'not_', $result);
     }
 }
 
-if(!function_exists('getAppConfiguration')) {
-    function getAppConfiguration(string $name, mixed $default = null): mixed {
+if(!function_exists('get_app_configuration')) {
+    function get_app_configuration(string $name, mixed $default = null): mixed {
         try {
             return AppConfiguration::get($name, $default)?->data;
         } catch (FireflyException) {
@@ -81,15 +81,15 @@ if(!function_exists('getAppConfiguration')) {
     }
 }
 
-if(!function_exists('formatAmountBySymbol')) {
-    function formatAmountBySymbol(string $amount, ?string $symbol = null, ?int $decimalPlaces = null, ?bool $coloured = null): string
+if(!function_exists('format_amount_by_symbol')) {
+    function format_amount_by_symbol(string $amount, ?string $symbol = null, ?int $decimalPlaces = null, ?bool $coloured = null): string
     {
         return Steam::formatAmountBySymbol($amount, $symbol, $decimalPlaces, $coloured);
     }
 }
 
-if (!function_exists('bladeAccountGetMetaField')) {
-    function bladeAccountGetMetaField(Account $account, string $field): string
+if (!function_exists('account_get_meta_field')) {
+    function account_get_meta_field(Account $account, string $field): string
     {
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
@@ -102,8 +102,8 @@ if (!function_exists('bladeAccountGetMetaField')) {
 }
 
 
-if (!function_exists('bladeAccountBalance')) {
-    function bladeAccountBalance(\FireflyIII\Models\Account $account): string
+if (!function_exists('account_balance')) {
+    function account_balance(\FireflyIII\Models\Account $account): string
     {
         /** @var Carbon $date */
         $date = now();
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 0accfde8a2..0621840d6d 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -61,34 +61,34 @@ class AppServiceProvider extends ServiceProvider
         });
 
 
-        // blade extension for active top menu sub menu (like "accounts")
-        // TODO DO NOT USE ME
-        Blade::directive('menuSubActive', function (string $route): string {
-            $route = trim($route, "'");
-            $name = Route::getCurrentRoute()->getName() ?? '';
-            Log::debug(sprintf('menuSubActive("%s", "%s")', $route, $name));
-            if (str_contains($name, $route)) {
-                return 'menu-open';
-            }
+//        // blade extension for active top menu sub menu (like "accounts")
+//        // TODO DO NOT USE ME
+//        Blade::directive('menuSubActive', function (string $route): string {
+//            $route = trim($route, "'");
+//            $name = Route::getCurrentRoute()->getName() ?? '';
+//            Log::debug(sprintf('menuSubActive("%s", "%s")', $route, $name));
+//            if (str_contains($name, $route)) {
+//                return 'menu-open';
+//            }
+//
+//            return '';
+//        });
 
-            return '';
-        });
-
-        // blade extension for active top menu sub menu item (like "accounts" => "asset accounts)
-        // TODO DO NOT USE ME
-        Blade::directive('menuSubItemActive', function (string $routeAndType): string {
-
-        });
+//        // blade extension for active top menu sub menu item (like "accounts" => "asset accounts)
+//        // TODO DO NOT USE ME
+//        Blade::directive('menuSubItemActive', function (string $routeAndType): string {
+//
+//        });
 
 
-        // TODO @deprecated
-        // blade extension for account balance.
-        Blade::directive('balance', function (string $account): string {
-            var_dump($account);
-            exit;
-            return $account;
-            return 'blablabla';
-        });
+//        // TODO @deprecated
+//        // blade extension for account balance.
+//        Blade::directive('balance', function (string $account): string {
+//            var_dump($account);
+//            exit;
+//            return $account;
+//            return 'blablabla';
+//        });
 
         // TODO @deprecated
         // blade extension
diff --git a/app/View/Components/Elements/TransactionRunningBalance.php b/app/View/Components/Elements/TransactionRunningBalance.php
index b5778003d8..fec7e92a4d 100644
--- a/app/View/Components/Elements/TransactionRunningBalance.php
+++ b/app/View/Components/Elements/TransactionRunningBalance.php
@@ -3,6 +3,7 @@
 namespace FireflyIII\View\Components\Elements;
 
 use Closure;
+use FireflyIII\Models\Account;
 use Illuminate\Contracts\View\View;
 use Illuminate\View\Component;
 
diff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.php
index 5b9b101c97..10dabc57a0 100644
--- a/resources/views/budgets/index.blade.php
+++ b/resources/views/budgets/index.blade.php
@@ -61,14 +61,14 @@
                             <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
                                 <small>{{ __('firefly.budgeted') }} ({{ __('firefly.see_below') }}):
                                     <span class="budgeted_amount" data-value="{{ $budgeted }}" data-id="0" data-currency="{{ $primaryCurrency['id'] }}">
-                                        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($budgeted, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!}
+                                        {!! format_amount_by_symbol($budgeted, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!}
                                     </span>
                                 </small>
                             </div>
                             {{-- info about the amount spent --}}
                             <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9 text-end">
                                 <small class="available_bar" data-id="0">{{ trans('firefly.available_between', ['start' => $start->isoFormat($monthAndDayFormat), 'end' => $end->isoFormat($monthAndDayFormat)]) }}:
-                                    <span class="available_amount" data-id="0" data-value="0" data-currency="{{ $primaryCurrency['id'] }}" data-value="0">{!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(0, $primaryCurrency->symbol, $primaryCurrency->decimal_places, true) !!}</span>
+                                    <span class="available_amount" data-id="0" data-value="0" data-currency="{{ $primaryCurrency['id'] }}" data-value="0">{!! format_amount_by_symbol(0, $primaryCurrency->symbol, $primaryCurrency->decimal_places, true) !!}</span>
                                 </small>
                             </div>
                         </div>
@@ -76,7 +76,7 @@
                         <div class="row spentInfo" data-id="0" data-value="{{ $spent }}">
                             <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                 <small>{{ trans('firefly.spent_between', ['start' => $start->isoFormat($monthAndDayFormat), 'end' => $end->isoFormat($monthAndDayFormat)]) }}:
-                                    {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($spent, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!} </small>
+                                    {!! format_amount_by_symbol($spent, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!} </small>
                             </div>
                         </div>
                     </div>
@@ -106,9 +106,9 @@
                                 <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
                                     <small>{{ __('firefly.budgeted') }}:
                                         <span class="text-success money-positive budgeted_amount" data-id="{{ $budget['id'] }}" data-currency="{{ $budget['transaction_currency']['id'] }}">
-                                        {!!  \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($budget['budgeted'], $budget['transaction_currency']['symbol'], $budget['transaction_currency']['decimal_places'], false)  !!}
+                                        {!!  format_amount_by_symbol($budget['budgeted'], $budget['transaction_currency']['symbol'], $budget['transaction_currency']['decimal_places'], false)  !!}
                                             @if(null !== $budget['pc_budgeted'])
-                                            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($budget['pc_budgeted'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, false)  !!})
+                                            ({!! format_amount_by_symbol($budget['pc_budgeted'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, false)  !!})
                                             @endif
                                     </span>
                                     </small>
@@ -118,9 +118,9 @@
                                     <small class="available_bar" data-id="{{ $budget['id'] }}">{{ trans('firefly.available_between', ['start' => $budget['start_date']->isoFormat($monthAndDayFormat), 'end' => $budget['end_date']->isoFormat($monthAndDayFormat)]) }}:
                                         <span class="available_amount" data-id="{{ $budget['id'] }}" data-currency="{{ $budget['transaction_currency']['id'] }}"
                                               data-value="{{ $budget['amount'] }}">
-                                            {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($budget['amount'], $budget['transaction_currency']['symbol'], $budget['transaction_currency']['decimal_places'], true) !!}
+                                            {!! format_amount_by_symbol($budget['amount'], $budget['transaction_currency']['symbol'], $budget['transaction_currency']['decimal_places'], true) !!}
                                         @if($convertToPrimary && 0 !== $budget->pc_amount)
-                                                ({!!  \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($budget->pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places, true)  !!})
+                                                ({!!  format_amount_by_symbol($budget->pc_amount, $primaryCurrency->symbol, $primaryCurrency->decimal_places, true)  !!})
                                             @endif
                                         </span>
                                     </small>
@@ -154,8 +154,8 @@
                                     <small>{!! trans('firefly.spent_between_left', [
                                             'start' => $budget['start_date']->isoFormat($monthAndDayFormat),
                                             'end' => $budget['end_date']->isoFormat($monthAndDayFormat),
-                                            'spent' => \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($budget['spent'], $budget['transaction_currency']['symbol'], $budget['transaction_currency']['decimal_places']),
-                                            'left' => \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($budget['budgeted'] + $budget['spent'], $budget['transaction_currency']['symbol'], $budget['transaction_currency']['decimal_places']),
+                                            'spent' => format_amount_by_symbol($budget['spent'], $budget['transaction_currency']['symbol'], $budget['transaction_currency']['decimal_places']),
+                                            'left' => format_amount_by_symbol($budget['budgeted'] + $budget['spent'], $budget['transaction_currency']['symbol'], $budget['transaction_currency']['decimal_places']),
                                         ])  !!}
                                         </small>
                                 </div>
@@ -323,11 +323,11 @@
                                     <td class="hidden-sm hidden-xs spent text-end" data-id="{{ $budget['id'] }}">
                                         {{-- this is spent in budget limits: --}}
                                         @foreach($budget['budgeted'] as $budgetLimit)
-                                        <span title="{{ __('firefly.spent_this_period') }}">{!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($budgetLimit['spent'], $budgetLimit['currency_symbol'], $budgetLimit['currency_decimal_places'])  !!}</span>
+                                        <span title="{{ __('firefly.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]) }}">({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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']]) }}">({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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
@@ -335,11 +335,11 @@
                                         {{-- this is spent NOT in budget limits: --}}
                                         @foreach($budget['spent'] as $spent)
                                         @if(0 !== bccomp('0', $spent['spent_outside']))
-                                            <span title="{{ __('firefly.spent_in_budget_limit_outside_period') }}">{!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($spent['spent_outside'], $spent['currency_symbol'], $spent['currency_decimal_places']) !!}</span>
+                                            <span title="{{ __('firefly.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]) }}">({!!  \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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]) }}">({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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
@@ -352,19 +352,19 @@
                                         @foreach($budget['budgeted'] as $budgetLimit)
                                             <span data-currency="{{ $budgetLimit['currency_id'] }}" data-limit="{{ $budgetLimit['id'] }}" data-value="{{ $budgetLimit['left'] }}" class="left_span amount_left">
                                                 {{-- the amount left --}}
-                                                <span title="{{ __('firefly.left_in_budget_limit_overview') }}">{!!  \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($budgetLimit['left'], $budgetLimit['currency_symbol'], $budgetLimit['currency_decimal_places'])  !!}</span>
+                                                <span title="{{ __('firefly.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(!$budgetLimit['in_past'] && -1 === bccomp('0', $budgetLimit['left']))
                                                     @if(0 === $budgetLimit['active_days_left'])
-                                                        <span title="{{ trans('firefly.left_in_budget_limit_per_day', ['days' => 0]) }}">({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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']]) }}">({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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(!$budgetLimit['in_past'] && -1 !== bccomp('0', $budgetLimit['left']))
-                                                    <span title="{{ trans('firefly.nothing_left_in_budget') }}">({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol('0', $budgetLimit['currency_symbol'], $budgetLimit['currency_decimal_places'])  !!})</span>
+                                                    <span title="{{ trans('firefly.nothing_left_in_budget') }}">({!! format_amount_by_symbol('0', $budgetLimit['currency_symbol'], $budgetLimit['currency_decimal_places'])  !!})</span>
                                                 @endif
                                             </span><br />
                                         @endforeach
diff --git a/resources/views/components/elements/transaction-amount.blade.php b/resources/views/components/elements/transaction-amount.blade.php
index 9468386bf1..21e40fb88c 100644
--- a/resources/views/components/elements/transaction-amount.blade.php
+++ b/resources/views/components/elements/transaction-amount.blade.php
@@ -2,14 +2,14 @@
 {{-- deposit --}}
 @if('Deposit' === $type)
     {{-- amount of deposit --}}
-    {!! formatAmountBySymbol($amount['amount']*-1, $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
+    {!! format_amount_by_symbol($amount['amount']*-1, $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
     {{-- foreign amount of deposit --}}
     @if(null !== $foreign['amount'])
-        ({!! formatAmountBySymbol($foreign['amount']*-1, $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
+        ({!! format_amount_by_symbol($foreign['amount']*-1, $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
     @endif
     {{--  primary currency amount of deposit --}}
     @if($convertToPrimary && 0 != $pcAmount)
-        (~ {!! formatAmountBySymbol($pcAmount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+        (~ {!! format_amount_by_symbol($pcAmount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
     @endif
     {{-- transfer --}}
 @elseif('Transfer' === $type)
@@ -17,97 +17,97 @@
     <span class="text-info money-transfer">
                     {{-- present as negative. --}}
         @if($transaction['source_account_id'] === $account?->id)
-            neg {!! formatAmountBySymbol($amount['amount'], $amount['currency_symbol'], $amount['currency_decimal_places'], false) !!}
+            neg {!! format_amount_by_symbol($amount['amount'], $amount['currency_symbol'], $amount['currency_decimal_places'], false) !!}
         @endif
         {{-- present as positive --}}
         @if($transaction['source_account_id'] !== $account?->id)
-            {!! formatAmountBySymbol($amount['amount']*-1, $amount['currency_symbol'], $amount['currency_decimal_places'], false) !!}
+            {!! format_amount_by_symbol($amount['amount']*-1, $amount['currency_symbol'], $amount['currency_decimal_places'], false) !!}
         @endif
         {{-- foreign amount of transfer (negative) --}}
         @if(null !== $foreign['amount'] && $transaction['source_account_id'] === $account?->id)
-            neg ({!! formatAmountBySymbol($foreign['amount'], $foreign['currency_symbol'], $foreign['currency_decimal_places'], false) !!})
+            neg ({!! format_amount_by_symbol($foreign['amount'], $foreign['currency_symbol'], $foreign['currency_decimal_places'], false) !!})
         @endif
         {{-- foreign amount of transfer (positive) --}}
         @if(null !== $foreign['amount'] && $transaction['source_account_id'] !== $account?->id)
-            ({!! formatAmountBySymbol($foreign['amount']*-1, $foreign['currency_symbol'], $foreign['currency_decimal_places'], false) !!})
+            ({!! format_amount_by_symbol($foreign['amount']*-1, $foreign['currency_symbol'], $foreign['currency_decimal_places'], false) !!})
         @endif
         {{-- transfer in primary currency. Does not care about direction. --}}
         @if($convertToPrimary && 0 !== $pcAmount)
-            (~ {!! formatAmountBySymbol($pcAmount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+            (~ {!! format_amount_by_symbol($pcAmount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
         @endif
                 </span>
     {{-- opening balance --}}
 @elseif('Opening balance' === $type)
     {{-- Is a positive opening balance, present as positive. --}}
     @if('Initial balance account' === $transaction['source_account_type'])
-        {!! formatAmountBySymbol($amount['amount']*-1, $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
+        {!! format_amount_by_symbol($amount['amount']*-1, $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
         {{-- opening balance may have foreign amount (also pos) --}}
         @if(null !== $foreign['amount'])
-            ({!! formatAmountBySymbol($foreign['amount']*-1, $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
+            ({!! format_amount_by_symbol($foreign['amount']*-1, $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
         @endif
         {{-- possibly, primary amount. --}}
         @if($convertToPrimary && 0 !== $pcAmount)
-            (~ {!! formatAmountBySymbol($pcAmount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+            (~ {!! format_amount_by_symbol($pcAmount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
         @endif
     @else
         {{-- withdrawal but also any other transaction type: --}}
-        {!! formatAmountBySymbol($amount['amount'], $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
+        {!! format_amount_by_symbol($amount['amount'], $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
         @if(null !== $foreign['amount'])
-            ({!! formatAmountBySymbol($foreign['amount'], $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
+            ({!! format_amount_by_symbol($foreign['amount'], $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
         @endif
         @if($convertToPrimary && 0 !== $pcAmount)
-            (~ {!! formatAmountBySymbol($pcAmount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+            (~ {!! format_amount_by_symbol($pcAmount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
         @endif
     @endif
 @elseif('Reconciliation' === $type)
     {{-- Reconciliation positive--}}
     @if('Reconciliation account' === $transaction['source_account_type'])
         {{-- amount, also foreign and converted. --}}
-        {!! formatAmountBySymbol($amount['amount']*-1, $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
+        {!! format_amount_by_symbol($amount['amount']*-1, $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
         @if(null !== $foreign['amount'])
-            ({!! formatAmountBySymbol($foreign['amount']*-1, $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
+            ({!! format_amount_by_symbol($foreign['amount']*-1, $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
         @endif
         @if($convertToPrimary && 0 !== $pcAmount)
-            (~ {!! formatAmountBySymbol($pcAmount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+            (~ {!! format_amount_by_symbol($pcAmount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
         @endif
     @else
         {{-- Reconciliation negative --}}
-        {!! formatAmountBySymbol($amount['amount'], $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
+        {!! format_amount_by_symbol($amount['amount'], $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
         @if(null !== $foreign['amount'])
-            ({!! formatAmountBySymbol($foreign['amount'], $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
+            ({!! format_amount_by_symbol($foreign['amount'], $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
         @endif
         @if($convertToPrimary && 0 !== $pcAmount)
-            (~ {!! formatAmountBySymbol($pcAmount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+            (~ {!! format_amount_by_symbol($pcAmount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
         @endif
     @endif
 @elseif('Liability credit' === $type)
     {{-- liability credit positive--}}
     @if('Liability credit' === $transaction['source_account_type'])
-        {!! formatAmountBySymbol($amount['amount'], $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
+        {!! format_amount_by_symbol($amount['amount'], $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
         @if(null !== $foreign['amount'])
-            ({!! formatAmountBySymbol($foreign['amount'], $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
+            ({!! format_amount_by_symbol($foreign['amount'], $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
         @endif
         @if($convertToPrimary && 0 !== $pcAmount)
-            (~ {!! formatAmountBySymbol($pcAmount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+            (~ {!! format_amount_by_symbol($pcAmount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
         @endif
     @else
-        {!! formatAmountBySymbol($amount['amount']*-1, $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
+        {!! format_amount_by_symbol($amount['amount']*-1, $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
         @if(null !== $foreign['amount'])
-            ({!! formatAmountBySymbol($foreign['amount']*-1, $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
+            ({!! format_amount_by_symbol($foreign['amount']*-1, $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
         @endif
         @if($convertToPrimary && 0 !== $pcAmount)
-            (~ {!! formatAmountBySymbol($pcAmount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+            (~ {!! format_amount_by_symbol($pcAmount*-1, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
         @endif
     @endif
 @else
     {{--  THE REST most likely, withdrawal but also any other transaction type: --}}
-    {!! formatAmountBySymbol($amount['amount'], $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
+    {!! format_amount_by_symbol($amount['amount'], $amount['currency_symbol'], $amount['currency_decimal_places']) !!}
     {{-- foreign amount of withdrawal --}}
     @if(null !== $foreign['amount'])
-        ({!! formatAmountBySymbol($foreign['amount'], $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
+        ({!! format_amount_by_symbol($foreign['amount'], $foreign['currency_symbol'], $foreign['currency_decimal_places']) !!})
     @endif
     {{--  primary currency amount of withdrawal, if not in foreign currency --}}
     @if($convertToPrimary && 0 !== $pcAmount && $primaryCurrency->id !== $foreign['currency_id'])
-        (~ {!! formatAmountBySymbol($pcAmount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+        (~ {!! format_amount_by_symbol($pcAmount, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
     @endif
 @endif
diff --git a/resources/views/components/elements/transaction-running-balance.blade.php b/resources/views/components/elements/transaction-running-balance.blade.php
index 6601490346..115ef15761 100644
--- a/resources/views/components/elements/transaction-running-balance.blade.php
+++ b/resources/views/components/elements/transaction-running-balance.blade.php
@@ -2,12 +2,12 @@
 @if(false === $balanceDirty && '' !== $destination['balance_after'] && '' !== $source['balance_after'])
     @if('Deposit' === $type)
         @if($source['id'] === $account?->id)
-            <span title="Deposit, source">{!! formatAmountBySymbol($source['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
+            <span title="Deposit, source">{!! format_amount_by_symbol($source['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
         @else
             @if('Revenue account' === $source['type'])
-                <span title="Deposit from revenue">{!! formatAmountBySymbol($destination['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
+                <span title="Deposit from revenue">{!! format_amount_by_symbol($destination['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
             @else
-                <span title="Deposit from liab">{!! formatAmountBySymbol($destination['balance_after'], $foreign['currency_symbol'], $foreign['decimal_places']) !!}</span>
+                <span title="Deposit from liab">{!! format_amount_by_symbol($destination['balance_after'], $foreign['currency_symbol'], $foreign['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 -}}
             {{-- changed from normal currency_symbol to foreign_currency_symbol for #12043 --}}
@@ -16,39 +16,39 @@
         {{-- withdrawal into a liability --}}
         @if(in_array($destination['type'], ['Mortgage','Debt','Loan'], true))
                 @if($account?->id === $source['id'])
-                    <span title="Withdrawal, liab, source">{!! formatAmountBySymbol($source['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
+                    <span title="Withdrawal, liab, source">{!! format_amount_by_symbol($source['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
                 @elseif($account?->id === $destination['id'])
-                    <span title="Withdrawal, liab, dest">{!! formatAmountBySymbol($destination['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
+                    <span title="Withdrawal, liab, dest">{!! format_amount_by_symbol($destination['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
                 @else
                     -
                 @endif
             {{-- withdrawal into an expense account --}}
         @else
             @if($account?->id === $source['id'])
-                <span title="Withdrawal, source">{!! formatAmountBySymbol($source['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
+                <span title="Withdrawal, source">{!! format_amount_by_symbol($source['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
             @elseif($account?->id === $destination['id'])
-                <span title="Withdrawal, dest">{!! formatAmountBySymbol($destination['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
+                <span title="Withdrawal, dest">{!! format_amount_by_symbol($destination['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
             @else
                 -
             @endif
         @endif
     @elseif('Opening balance' === $type)
         @if($account?->id == $source['id'])
-            <span title="Opening balance, src">{!! formatAmountBySymbol($source['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
+            <span title="Opening balance, src">{!! format_amount_by_symbol($source['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
         @elseif($account?->id == $destination['id'])
-            <span title="Opening balance, dest">{!! formatAmountBySymbol($destination['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
+            <span title="Opening balance, dest">{!! format_amount_by_symbol($destination['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
         @else
             -
         @endif
     @elseif('Transfer' === $type)
         @if($account?->id == $source['id'])
-            <span title="Transfer, source">{!! formatAmountBySymbol($source['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
+            <span title="Transfer, source">{!! format_amount_by_symbol($source['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
         @else
             @if(null === $foreign['id'])
-                <span title="Transfer, dest, normal currency">{!! formatAmountBySymbol($destination['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
+                <span title="Transfer, dest, normal currency">{!! format_amount_by_symbol($destination['balance_after'], $currency['symbol'], $currency['decimal_places']) !!}</span>
             @endif
             @if(null !== $foreign['id'])
-                <span title="Transfer, dest, foreign currency">{!! formatAmountBySymbol($destination['balance_after'], $foreign['currency_symbol'], $foreign['decimal_places']) !!}</span>
+                <span title="Transfer, dest, foreign currency">{!! format_amount_by_symbol($destination['balance_after'], $foreign['currency_symbol'], $foreign['decimal_places']) !!}</span>
             @endif
         @endif
     @else
diff --git a/resources/views/components/generic/amount.blade.php b/resources/views/components/generic/amount.blade.php
index d90d7e9926..1cf5d59862 100644
--- a/resources/views/components/generic/amount.blade.php
+++ b/resources/views/components/generic/amount.blade.php
@@ -3,22 +3,22 @@
 
 
 @if(\FireflyIII\Enums\TransactionTypeEnum::DEPOSIT->value === $transaction['transaction_type_type'])
-    {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['amount'],'-1'), $transaction['currency_symbol'], $transaction['currency_decimal_places']) !!}
+    {!! format_amount_by_symbol(bcmul($transaction['amount'],'-1'), $transaction['currency_symbol'], $transaction['currency_decimal_places']) !!}
     @if(null !== $transaction['foreign_amount'])
-        ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['foreign_amount'], '-1'), $transaction['foreign_currency_symbol'], $transaction['foreign_currency_decimal_places']) !!})
+        ({!! format_amount_by_symbol(bcmul($transaction['foreign_amount'], '-1'), $transaction['foreign_currency_symbol'], $transaction['foreign_currency_decimal_places']) !!})
     @endif
     @if($convertToPrimary && null !== $transaction['pc_amount'])
-        ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['pc_amount'], '-1'), $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+        ({!! format_amount_by_symbol(bcmul($transaction['pc_amount'], '-1'), $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
     @endif
 @endif
 
 @if(\FireflyIII\Enums\TransactionTypeEnum::WITHDRAWAL->value === $transaction['transaction_type_type'])
-    {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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'])
-        ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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 && null !== $transaction['pc_amount'])
-        ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($transaction['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+        ({!! format_amount_by_symbol($transaction['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
     @endif
 @endif
 
@@ -26,23 +26,23 @@
     <span class="text-info money-transfer">
     {{-- transfer away --}}
     @if(isset($account) && $transaction['source_account_id'] === $account->id)
-        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['amount'],'-1'), $transaction['currency_symbol'], $transaction['currency_decimal_places'], false) !!}
+        {!! format_amount_by_symbol(bcmul($transaction['amount'],'-1'), $transaction['currency_symbol'], $transaction['currency_decimal_places'], false) !!}
         @if(null !== $transaction['foreign_amount'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['foreign_amount'],'-1'), $transaction['foreign_currency_symbol'], $transaction['foreign_currency_decimal_places'], false) !!})
+            ({!! format_amount_by_symbol(bcmul($transaction['foreign_amount'],'-1'), $transaction['foreign_currency_symbol'], $transaction['foreign_currency_decimal_places'], false) !!})
         @endif
         @if($convertToPrimary && null !== $transaction['pc_amount'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['pc_amount'], '-1'), $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
+            ({!! format_amount_by_symbol(bcmul($transaction['pc_amount'], '-1'), $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
         @endif
     @endif
 
     {{-- transfer in (default) --}}
     @if(!isset($account) || $transaction['source_account_id'] !== $account->id)
-        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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 && null !== $transaction['pc_amount'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($transaction['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
+            ({!! format_amount_by_symbol($transaction['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
         @endif
     @endif
     </span>
@@ -52,23 +52,23 @@
 @if(\FireflyIII\Enums\TransactionTypeEnum::OPENING_BALANCE->value === $transaction['transaction_type_type'])
     {{-- Opening balance is deposited on this account (render as positive amount) --}}
     @if(\FireflyIII\Enums\AccountTypeEnum::INITIAL_BALANCE->value === $transaction['source_account_type'])
-        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['amount'],'-1'), $transaction['currency_symbol'], $transaction['currency_decimal_places'], false) !!}
+        {!! format_amount_by_symbol(bcmul($transaction['amount'],'-1'), $transaction['currency_symbol'], $transaction['currency_decimal_places'], false) !!}
         @if(null !== $transaction['foreign_amount'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['foreign_amount'],'-1'), $transaction['foreign_currency_symbol'], $transaction['foreign_currency_decimal_places'], false) !!})
+            ({!! format_amount_by_symbol(bcmul($transaction['foreign_amount'],'-1'), $transaction['foreign_currency_symbol'], $transaction['foreign_currency_decimal_places'], false) !!})
         @endif
         @if($convertToPrimary && null !== $transaction['pc_amount'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['pc_amount'], '-1'), $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
+            ({!! format_amount_by_symbol(bcmul($transaction['pc_amount'], '-1'), $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
         @endif
     @endif
 
     {{-- Opening balance is removed from this account (render as negative amount) --}}
     @if(\FireflyIII\Enums\AccountTypeEnum::INITIAL_BALANCE->value === $transaction['destination_account_type'])
-        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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 && null !== $transaction['pc_amount'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($transaction['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
+            ({!! format_amount_by_symbol($transaction['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
         @endif
     @endif
 @endif
@@ -76,23 +76,23 @@
 @if(\FireflyIII\Enums\TransactionTypeEnum::RECONCILIATION->value === $transaction['transaction_type_type'])
     {{-- Reconciliation correction is deposited on this account (render as positive amount) --}}
     @if(\FireflyIII\Enums\AccountTypeEnum::RECONCILIATION->value === $transaction['source_account_type'])
-        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['amount'],'-1'), $transaction['currency_symbol'], $transaction['currency_decimal_places'], false) !!}
+        {!! format_amount_by_symbol(bcmul($transaction['amount'],'-1'), $transaction['currency_symbol'], $transaction['currency_decimal_places'], false) !!}
         @if(null !== $transaction['foreign_amount'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['foreign_amount'],'-1'), $transaction['foreign_currency_symbol'], $transaction['foreign_currency_decimal_places'], false) !!})
+            ({!! format_amount_by_symbol(bcmul($transaction['foreign_amount'],'-1'), $transaction['foreign_currency_symbol'], $transaction['foreign_currency_decimal_places'], false) !!})
         @endif
         @if($convertToPrimary && null !== $transaction['pc_amount'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(bcmul($transaction['pc_amount'], '-1'), $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
+            ({!! format_amount_by_symbol(bcmul($transaction['pc_amount'], '-1'), $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
         @endif
     @endif
 
     {{-- Reconciliation correction is removed from this account (render as negative amount) --}}
     @if(\FireflyIII\Enums\AccountTypeEnum::RECONCILIATION->value === $transaction['destination_account_type'])
-        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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 && null !== $transaction['pc_amount'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($transaction['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
+            ({!! format_amount_by_symbol($transaction['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places, false) !!})
         @endif
     @endif
 @endif
@@ -104,12 +104,12 @@
 
 {% elseif transaction.transaction_type_type == 'Reconciliation' %}
 {% else %}
-  {{ formatAmountBySymbol(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 %}
-      ({{ formatAmountBySymbol(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 %}
-      ({{ formatAmountBySymbol(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/accounts.blade.php b/resources/views/components/lists/accounts.blade.php
index 1ee4e7a36e..e53954e7a9 100644
--- a/resources/views/components/lists/accounts.blade.php
+++ b/resources/views/components/lists/accounts.blade.php
@@ -63,7 +63,7 @@
         <td>{{ trans('firefly.liability_direction_' . $account->liability_direction . '_short')  }}</td>
         <td>{{ $account->interest }}% ({{ strtolower($account->interestPeriod) }})</td>
         @endif
-        <td class="hidden-sm hidden-xs">{{ $account->iban }} @if('' === $account->iban) {{ bladeAccountGetMetaField($account, 'account_number') }}@endif</td>
+        <td class="hidden-sm hidden-xs">{{ $account->iban }} @if('' === $account->iban) {{ account_get_meta_field($account, 'account_number') }}@endif</td>
         @if('liabilities' !== $objectType)
         <td class="text-right">
                 <span class="mr-2">
@@ -71,11 +71,11 @@
                         <span title="{{ $key }}">
                         @if('balance' === $key)
                             @if(!$convertToPrimary)
-                                {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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)
-                                {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($balance, $primaryCurrency->symbol, $primaryCurrency->decimal_places)   !!}
+                                {!! format_amount_by_symbol($balance, $primaryCurrency->symbol, $primaryCurrency->decimal_places)   !!}
                             @endif
                         @else
                             ({!! \FireflyIII\Support\Facades\Steam::formatAmountByCode($balance, $key)   !!})
@@ -89,7 +89,7 @@
         <td class="text-right">
             @if('' !== $account->current_debt)
             <span class="text-info money-transfer">
-                        {!!  \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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>
@@ -121,11 +121,11 @@
                         <span title="{{ $key }}">
                             @if('balance' === $key)
                                 @if(!$convertToPrimary)
-                                      {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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)
-                                      {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($balance, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!}
+                                      {!! format_amount_by_symbol($balance, $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!}
                                   @endif
                               @else
                                   ({!! \FireflyIII\Support\Facades\Steam::formatAmountByCode($balance, $key) !!})
diff --git a/resources/views/components/lists/groups-large.blade.php b/resources/views/components/lists/groups-large.blade.php
index 03aaf19d52..25b86899a8 100644
--- a/resources/views/components/lists/groups-large.blade.php
+++ b/resources/views/components/lists/groups-large.blade.php
@@ -27,7 +27,7 @@
         <th class="d-xs-none">&nbsp;</th>
         <th>{{ trans('list.description') }}</th>
         <th class="text-end">{{ trans('list.amount') }}</th>
-        @if(getAppConfiguration('use_running_balance', true))
+        @if(get_app_configuration('use_running_balance', true))
             <th class="text-end">{{ trans('list.running_balance') }}</th>
         @endif
         <th>{{ trans('list.date') }}</th>
@@ -54,23 +54,23 @@
                 {{-- Total amount of all journals in the group. --}}
                 @foreach($group['sums'] as $sum)
                     @if('Deposit' === $group['transaction_type'])
-                        {!! formatAmountBySymbol($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 && 0 !== $sum['pc_amount'])
-                            (~ {!! formatAmountBySymbol($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 !== count($group['sums'])-1),@endif
                     @elseif('Transfer' === $group['transaction_type'])
                         <span class="text-info money-transfer">
-                        {!! formatAmountBySymbol($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 && 0 !== $sum['pc_amount'])
-                            (~ {!! formatAmountBySymbol($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 !== count($group['sums'])-1),@endif
                         </span>
                     @else
-                        {!! formatAmountBySymbol($sum['amount'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
+                        {!! format_amount_by_symbol($sum['amount'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
                         @if($convertToPrimary && 0 !== $sum['pc_amount'])
-                            (~ {!! formatAmountBySymbol($sum['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
+                            (~ {!! format_amount_by_symbol($sum['pc_amount'], $primaryCurrency->symbol, $primaryCurrency->decimal_places) !!})
                          @endif
                         @if($loop->index !== count($group['sums'])-1),@endif
                    @endif
@@ -130,7 +130,7 @@
                 :pc-amount="$transaction['pc_amount']"
             />
         </td>
-        @if(getAppConfiguration('use_running_balance', true))
+        @if(get_app_configuration('use_running_balance', true))
         <td class=" {{ $className }} text-end">
             <x-elements.transaction-running-balance
                 :balance-dirty="$transaction['balance_dirty'] ?? false"
diff --git a/resources/views/components/lists/periods.blade.php b/resources/views/components/lists/periods.blade.php
index 703f4f285f..40a945ea71 100644
--- a/resources/views/components/lists/periods.blade.php
+++ b/resources/views/components/lists/periods.blade.php
@@ -19,7 +19,7 @@
                         <td class="third">{{ __('firefly.spent') }}</td>
                         <td class="text-right">
                             <span title="Count: {{ $spent['count'] }}">
-                                {!! formatAmountBySymbol($spent['amount'], $spent['currency_symbol'], $spent['currency_decimal_places']) !!}
+                                {!! format_amount_by_symbol($spent['amount'], $spent['currency_symbol'], $spent['currency_decimal_places']) !!}
                             </span>
                         </td>
                     </tr>
@@ -34,9 +34,9 @@
                                 <td class="text-right">
                                     <span title="Count: {{ $entry['count'] }}">
                                         @if($entry['amount'] < 0)
-                                            {!! formatAmountBySymbol($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
-                                            {!! formatAmountBySymbol($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>
@@ -50,7 +50,7 @@
                 <td class="third">{{ __('firefly.transferred') }}</td>
                 <td class="text-right">
                                 <span title="Count: {{ $entry['count'] }}">
-                                    {!! formatAmountBySymbol($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>
@@ -64,9 +64,9 @@
                 <td class="text-right">
                                 <span title="Count: {{ $entry['count'] }}">
                                     @if($entry['amount'] < 0)
-                                        {!! formatAmountBySymbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places']) !!}
+                                        {!! format_amount_by_symbol($entry['amount'], $entry['currency_symbol'], $entry['currency_decimal_places']) !!}
                                     @else
-                                        {!! formatAmountBySymbol($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>
@@ -81,9 +81,9 @@
                 <td class="text-right">
                                 <span title="Count: {{ $entry['count'] }}">
                                     @if($entry['amount'] < 0)
-                                        {!! formatAmountBySymbol($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
-                                        {!! formatAmountBySymbol($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/components/lists/piggy-banks.blade.php b/resources/views/components/lists/piggy-banks.blade.php
index b820a28bcb..53e2441a12 100644
--- a/resources/views/components/lists/piggy-banks.blade.php
+++ b/resources/views/components/lists/piggy-banks.blade.php
@@ -44,9 +44,9 @@
         </td>
         <td class="text-end piggySaved">
                     <span title="Saved so far" class="text-end">
-                        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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 && null !== $piggy['pc_current_amount'])
-                            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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>
@@ -84,25 +84,25 @@
         </td>
         <td class="text-end">
             @if(null !== $piggy['target_amount'] && 0 !== $piggy['target_amount'])
-            <span title="{{ __('firefly.target_amount') }}">{!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($piggy['target_amount'],$piggy['currency_symbol'],$piggy['currency_decimal_places']) !!}</span>
+            <span title="{{ __('firefly.target_amount') }}">{!! format_amount_by_symbol($piggy['target_amount'],$piggy['currency_symbol'],$piggy['currency_decimal_places']) !!}</span>
             @if($convertToPrimary && $piggy['currency_id'] !== $primaryCurrency->id && null !== $piggy['pc_target_amount'])
-            (<span title="{{ __('firefly.target_amount') }}">{!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($piggy['pc_target_amount'],$primaryCurrency->symbol, $primaryCurrency->decimal_places)  !!}</span>)
+            (<span title="{{ __('firefly.target_amount') }}">{!! format_amount_by_symbol($piggy['pc_target_amount'],$primaryCurrency->symbol, $primaryCurrency->decimal_places)  !!}</span>)
             @endif
             @endif
         </td>
         <td class="text-end d-none d-md-table-cell">
             @if($piggy['left_to_save'] > 0)
-            <span title="{{ __('firefly.left_to_save') }}">{!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($piggy['left_to_save'],$piggy['currency_symbol'],$piggy['currency_decimal_places']) !!}</span>
+            <span title="{{ __('firefly.left_to_save') }}">{!! format_amount_by_symbol($piggy['left_to_save'],$piggy['currency_symbol'],$piggy['currency_decimal_places']) !!}</span>
                 @if($convertToPrimary && $piggy['currency_id'] !== $primaryCurrency->id && null !== $piggy['pc_left_to_save'])
-            (<span title="{{ __('firefly.left_to_save') }}">{!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($piggy['pc_left_to_save'], $primaryCurrency->symbol,$primaryCurrency->decimal_places) !!}</span>)
+            (<span title="{{ __('firefly.left_to_save') }}">{!! format_amount_by_symbol($piggy['pc_left_to_save'], $primaryCurrency->symbol,$primaryCurrency->decimal_places) !!}</span>)
             @endif
             @endif
         </td>
         <td class="d-none d-md-table-cell text-end">
             @if(null !== $piggy['target_date'] && null !== $piggy['save_per_month'])
-            {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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 && $piggy['currency_id'] !== $primaryCurrency->id && null !== $piggy['pc_save_per_month'])
-            ({!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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>
@@ -115,7 +115,7 @@
         <td>&nbsp;</td> {{-- title --}}
         <td class="text-end">
             @foreach($objectGroup['sums'] as $sum)
-            {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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="d-none d-md-table-cell">&nbsp;</td> {{-- remove money --}}
@@ -123,17 +123,17 @@
         <td class="d-none d-md-table-cell">&nbsp;</td> {{-- add money --}}
         <td class="text-end">
             @foreach($objectGroup['sums'] as $sum)
-            {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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-end d-none d-md-table-cell">
             @foreach($objectGroup['sums'] as $sum)
-            {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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="d-none d-md-table-cell text-end">
             @foreach($objectGroup['sums'] as $sum)
-            {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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/components/lists/subscriptions.blade.php b/resources/views/components/lists/subscriptions.blade.php
index dc0818cde8..74138ad337 100644
--- a/resources/views/components/lists/subscriptions.blade.php
+++ b/resources/views/components/lists/subscriptions.blade.php
@@ -54,11 +54,11 @@
             @endif
         </td>
         <td class="text-right">
-                <span class="mr-2" title="{{ e(\FireflyIII\Support\Facades\Steam::formatAmountBySymbol($entry['amount_min'], $entry['currency_symbol'], $entry['currency_decimal_places'], false)) }} -- {{ e(\FireflyIII\Support\Facades\Steam::formatAmountBySymbol($entry['amount_max'], $entry['currency_symbol'], $entry['currency_decimal_places'], false)) }}">
-                    ~ {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(($entry['amount_max'] + $entry['amount_min'])/2, $entry['currency_symbol'], $entry['currency_decimal_places'])  !!}
+                <span class="mr-2" title="{{ e(format_amount_by_symbol($entry['amount_min'], $entry['currency_symbol'], $entry['currency_decimal_places'], false)) }} -- {{ e(format_amount_by_symbol($entry['amount_max'], $entry['currency_symbol'], $entry['currency_decimal_places'], false)) }}">
+                    ~ {!! 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'])
-                        (~ {{ \FireflyIII\Support\Facades\Steam::formatAmountBySymbol(($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>
@@ -165,7 +165,7 @@
             <small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }}) ({{ __('firefly.active_exp_bills_only') }})</small>
         </td>
         <td class="text-right"> <!-- amount -->
-            {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($sum['avg'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
+            {!! format_amount_by_symbol($sum['avg'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
         </td>
         <td class="hidden-sm hidden-xs" colspan="3">&nbsp;</td> <!-- handle -->
     </tr>
@@ -177,7 +177,7 @@
             <small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }}) ({{ __('firefly.left_to_pay_active_bills') }})</small>
         </td>
         <td class="text-right"> <!-- amount -->
-            {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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 class="hidden-sm hidden-xs" colspan="3">&nbsp;</td> <!-- handle -->
     </tr>
@@ -190,7 +190,7 @@
                 ({{ __('firefly.active_bills_only') }})</small>
         </td>
         <td class="text-right"> <!-- amount -->
-            {!!  \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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 class="hidden-sm hidden-xs" colspan="3">&nbsp;</td> <!-- handle -->
     </tr>
@@ -215,7 +215,7 @@
             <small>{{ __('firefly.sum') }} ({{ $sum['currency_name'] }}) ({{ __('firefly.active_exp_bills_only_total') }})</small>
         </td>
         <td class="text-right"> <!-- amount -->
-            {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($sum['avg'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
+            {!! format_amount_by_symbol($sum['avg'], $sum['currency_symbol'], $sum['currency_decimal_places']) !!}
         </td>
     </tr>
     @endif
@@ -226,7 +226,7 @@
                 ({{ __('firefly.active_bills_only_total') }})</small>
         </td>
         <td class="text-right"> <!-- amount -->
-            {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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>
     </tr>
     @endif
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 2fa08871d7..eaada90445 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -98,7 +98,7 @@
 
                         <div class="btn-group" role="group">
                             <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                                 {{ bladeAccountBalance($data['account']) }}
+                                 {{ account_balance($data['account']) }}
                             </button>
                             <ul class="dropdown-menu">
                                 <li>
diff --git a/resources/views/json/piggy-banks.blade.php b/resources/views/json/piggy-banks.blade.php
index 59e55a150e..53cbe28953 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'])
-                         {{ \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($entry['pc_amount'], $entry['primary_currency_symbol'], $entry['primary_currency_decimal_places'], false) }}
-                        ({{ \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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)
-                        {{ \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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'])
-                    {{ \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($entry['pc_amount'], $entry['primary_currency_symbol'], $entry['primary_currency_decimal_places'], false) }}
-                    ({{ \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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)
-                    {{ \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($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/piggy-banks/index.blade.php b/resources/views/piggy-banks/index.blade.php
index 96cb446af9..269a74b8c8 100644
--- a/resources/views/piggy-banks/index.blade.php
+++ b/resources/views/piggy-banks/index.blade.php
@@ -39,19 +39,19 @@
                                 <tr>
                                     <td><a href="{{ route('accounts.show', $id) }}" title="{{ $info['name'] }}">{{ $info['name'] }}</a></td>
                                     <td class="text-right hidden-sm hidden-xs">
-                                        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($info['current_balance'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
+                                        {!! format_amount_by_symbol($info['current_balance'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
                                     </td>
                                     <td class="text-right">
-                                        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($info['left'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
+                                        {!! format_amount_by_symbol($info['left'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
                                     </td>
                                     <td class="text-right hidden-sm hidden-xs">
-                                        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($info['target'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
+                                        {!! format_amount_by_symbol($info['target'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
                                     </td>
                                     <td class="text-right hidden-sm hidden-xs">
-                                        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($info['saved'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
+                                        {!! format_amount_by_symbol($info['saved'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
                                     </td>
                                     <td class="text-right hidden-sm hidden-xs">
-                                        {!! \FireflyIII\Support\Facades\Steam::formatAmountBySymbol($info['to_save'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
+                                        {!! format_amount_by_symbol($info['to_save'],$info['currency_symbol'],$info['currency_decimal_places']) !!}
                                     </td>
                                 </tr>
                             @endforeach
diff --git a/resources/views/rules/index.blade.php b/resources/views/rules/index.blade.php
index 816a4e4f14..ef491db86e 100644
--- a/resources/views/rules/index.blade.php
+++ b/resources/views/rules/index.blade.php
@@ -123,7 +123,7 @@ $shownDemo = true
                                                         text-muted
                                                    @endif
                                                    "
-                                                ><br/>{{ parseMarkdown($rule->description) }}</small>
+                                                ><br/>{{ parse_markdown($rule->description) }}</small>
                                                @endif
                                             <small>(@if($rule->strict)<span class="text-danger">{{ __('firefly.rule_is_strict') }}</span>@else<span class="text-success">{{ __('firefly.rule_is_not_strict') }}</span>@endif&ZeroWidthSpace;)</small>
                                         </td>
@@ -137,7 +137,7 @@ $shownDemo = true
                                                                     class="text-muted"
                                                                 @endif
                                                                 data-id="{{ $trigger->id }}">
-                                                                {{ trans(('firefly.rule_trigger_' . getRootSearchOperator($trigger->trigger_type)), ['trigger_value' => $trigger->trigger_value]) }}
+                                                                {{ trans(('firefly.rule_trigger_' . get_root_search_operator($trigger->trigger_type)), ['trigger_value' => $trigger->trigger_value]) }}
                                                                 @if($trigger->stop_processing)
                                                                     <span class="fa fa-stop-circle-o"></span>
                                                                 @endif
diff --git a/resources/views/rules/old-index.twig b/resources/views/rules/old-index.twig
index d447821bd8..212e43bd9a 100644
--- a/resources/views/rules/old-index.twig
+++ b/resources/views/rules/old-index.twig
@@ -143,7 +143,7 @@
                                                                     class="text-muted"
                                                                 {% endif %}
                                                                 data-id="{{ trigger.id }}">
-                                                                {{ trans(('firefly.rule_trigger_' ~ getRootSearchOperator(trigger.trigger_type)), {trigger_value: trigger.trigger_value}) }}
+                                                                {{ trans(('firefly.rule_trigger_' ~ get_root_search_operator(trigger.trigger_type)), {trigger_value: trigger.trigger_value}) }}
 
                                                                 {% if trigger.stop_processing %}
                                                                     <span class="fa fa-stop-circle-o"></span>