diff --git a/app/Generator/Report/Account/MonthReportGenerator.php b/app/Generator/Report/Account/MonthReportGenerator.php
index e55ca69b50..a38d7699f2 100644
--- a/app/Generator/Report/Account/MonthReportGenerator.php
+++ b/app/Generator/Report/Account/MonthReportGenerator.php
@@ -52,7 +52,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $reportType      = 'account';
         $preferredPeriod = $this->preferredPeriod();
         try {
-            $result = prefixView('reports.double.report', compact('accountIds', 'reportType', 'doubleIds', 'preferredPeriod'))
+            $result = view('reports.double.report', compact('accountIds', 'reportType', 'doubleIds', 'preferredPeriod'))
                 ->with('start', $this->start)->with('end', $this->end)
                 ->with('doubles', $this->expense)
                 ->render();
diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php
index 393c98e782..1895916c37 100644
--- a/app/Generator/Report/Audit/MonthReportGenerator.php
+++ b/app/Generator/Report/Audit/MonthReportGenerator.php
@@ -78,7 +78,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
                         'due_date', 'payment_date', 'invoice_date',
         ];
         try {
-            $result = prefixView('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
+            $result = view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
                 ->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts)
                 ->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php
index 63bd4ce9e8..278bd4a7c7 100644
--- a/app/Generator/Report/Budget/MonthReportGenerator.php
+++ b/app/Generator/Report/Budget/MonthReportGenerator.php
@@ -64,7 +64,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $accountIds = implode(',', $this->accounts->pluck('id')->toArray());
         $budgetIds  = implode(',', $this->budgets->pluck('id')->toArray());
         try {
-            $result = prefixView(
+            $result = view(
                 'reports.budget.month',
                 compact('accountIds', 'budgetIds')
             )
diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php
index 1a5eebd205..252757409e 100644
--- a/app/Generator/Report/Category/MonthReportGenerator.php
+++ b/app/Generator/Report/Category/MonthReportGenerator.php
@@ -76,7 +76,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
         // render!
         try {
-            return prefixView('reports.category.month', compact('accountIds', 'categoryIds', 'reportType'))
+            return view('reports.category.month', compact('accountIds', 'categoryIds', 'reportType'))
                 ->with('start', $this->start)->with('end', $this->end)
                 ->with('categories', $this->categories)
                 ->with('accounts', $this->accounts)
diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php
index 1b7caea103..8d787e5c8d 100644
--- a/app/Generator/Report/Standard/MonthReportGenerator.php
+++ b/app/Generator/Report/Standard/MonthReportGenerator.php
@@ -53,7 +53,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
         $reportType = 'default';
 
         try {
-            return prefixView('reports.default.month', compact('accountIds', 'reportType'))->with('start', $this->start)->with('end', $this->end)->render();
+            return view('reports.default.month', compact('accountIds', 'reportType'))->with('start', $this->start)->with('end', $this->end)->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Cannot render reports.default.month: %s', $e->getMessage()));
             $result = 'Could not render report view.';
diff --git a/app/Generator/Report/Standard/MultiYearReportGenerator.php b/app/Generator/Report/Standard/MultiYearReportGenerator.php
index 1a8025b68d..09794671e0 100644
--- a/app/Generator/Report/Standard/MultiYearReportGenerator.php
+++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php
@@ -54,7 +54,7 @@ class MultiYearReportGenerator implements ReportGeneratorInterface
         $reportType = 'default';
 
         try {
-            return prefixView(
+            return view(
                 'reports.default.multi-year',
                 compact('accountIds', 'reportType')
             )->with('start', $this->start)->with('end', $this->end)->render();
diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php
index 8da980de7f..95f52190db 100644
--- a/app/Generator/Report/Standard/YearReportGenerator.php
+++ b/app/Generator/Report/Standard/YearReportGenerator.php
@@ -54,7 +54,7 @@ class YearReportGenerator implements ReportGeneratorInterface
         $reportType = 'default';
 
         try {
-            $result = prefixView(
+            $result = view(
                 'reports.default.year',
                 compact('accountIds', 'reportType')
             )->with('start', $this->start)->with('end', $this->end)->render();
diff --git a/app/Generator/Report/Tag/MonthReportGenerator.php b/app/Generator/Report/Tag/MonthReportGenerator.php
index c182ce4b9f..87feaf83a9 100644
--- a/app/Generator/Report/Tag/MonthReportGenerator.php
+++ b/app/Generator/Report/Tag/MonthReportGenerator.php
@@ -75,7 +75,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
 
         // render!
         try {
-            $result = prefixView(
+            $result = view(
                 'reports.tag.month',
                 compact('accountIds', 'reportType', 'tagIds')
             )->with('start', $this->start)->with('end', $this->end)->with('tags', $this->tags)->with('accounts', $this->accounts)->render();
diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php
index 00c4c55376..4ec43f9159 100644
--- a/app/Http/Controllers/Account/CreateController.php
+++ b/app/Http/Controllers/Account/CreateController.php
@@ -124,7 +124,7 @@ class CreateController extends Controller
         $request->session()->forget('accounts.create.fromStore');
         Log::channel('audit')->info('Creating new account.');
 
-        return prefixView(
+        return view(
             'accounts.create',
             compact('subTitleIcon', 'liabilityDirections', 'locations', 'objectType', 'interestPeriods', 'subTitle', 'roles', 'liabilityTypes')
         );
diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php
index 41732a441e..cedf296bd8 100644
--- a/app/Http/Controllers/Account/DeleteController.php
+++ b/app/Http/Controllers/Account/DeleteController.php
@@ -84,7 +84,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('accounts.delete.uri');
 
-        return prefixView('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
+        return view('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
     }
 
     /**
diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php
index 3e345ccf20..b0b5f5ee21 100644
--- a/app/Http/Controllers/Account/EditController.php
+++ b/app/Http/Controllers/Account/EditController.php
@@ -159,7 +159,7 @@ class EditController extends Controller
 
         $request->session()->flash('preFilled', $preFilled);
 
-        return prefixView(
+        return view(
             'accounts.edit',
             compact(
                 'account',
diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php
index 3d301fb9de..bbb561c956 100644
--- a/app/Http/Controllers/Account/IndexController.php
+++ b/app/Http/Controllers/Account/IndexController.php
@@ -117,7 +117,7 @@ class IndexController extends Controller
         $accounts = new LengthAwarePaginator($accounts, $total, $pageSize, $page);
         $accounts->setPath(route('accounts.inactive.index', [$objectType]));
 
-        return prefixView('accounts.index', compact('objectType', 'inactivePage', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
+        return view('accounts.index', compact('objectType', 'inactivePage', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
 
     }
 
@@ -188,6 +188,6 @@ class IndexController extends Controller
         Log::debug(sprintf('Count of accounts after LAP (1): %d', $accounts->count()));
         Log::debug(sprintf('Count of accounts after LAP (2): %d', $accounts->getCollection()->count()));
 
-        return prefixView('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
+        return view('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
     }
 }
diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php
index e3ae62ec91..4ac2b31640 100644
--- a/app/Http/Controllers/Account/ReconcileController.php
+++ b/app/Http/Controllers/Account/ReconcileController.php
@@ -136,7 +136,7 @@ class ReconcileController extends Controller
         $indexUri        = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
         $objectType      = 'asset';
 
-        return prefixView(
+        return view(
             'accounts.reconcile.index',
             compact(
                 'account',
diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php
index 500c263b24..df37b3168b 100644
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -135,7 +135,7 @@ class ShowController extends Controller
         $showAll = false;
         $balance = app('steam')->balance($account, $end);
 
-        return prefixView(
+        return view(
             'accounts.show',
             compact(
                 'account',
@@ -194,7 +194,7 @@ class ShowController extends Controller
         $showAll  = true;
         $balance  = app('steam')->balance($account, $end);
 
-        return prefixView(
+        return view(
             'accounts.show',
             compact(
                 'account',
diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php
index 036c75fef1..775b20fd21 100644
--- a/app/Http/Controllers/Admin/ConfigurationController.php
+++ b/app/Http/Controllers/Admin/ConfigurationController.php
@@ -75,7 +75,7 @@ class ConfigurationController extends Controller
         $isDemoSite     = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
         $siteOwner      = config('firefly.site_owner');
 
-        return prefixView(
+        return view(
             'admin.configuration.index',
             compact('subTitle', 'subTitleIcon', 'singleUserMode', 'isDemoSite', 'siteOwner')
         );
diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php
index 8a86f678d6..3b4f76a38b 100644
--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -68,7 +68,7 @@ class HomeController extends Controller
         }
         Log::debug('Email is ', [$email]);
 
-        return prefixView('admin.index', compact('title', 'mainTitleIcon', 'email'));
+        return view('admin.index', compact('title', 'mainTitleIcon', 'email'));
     }
 
     /**
diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php
index d4ff3b1a77..0fe0d5be0e 100644
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -79,7 +79,7 @@ class LinkController extends Controller
             $this->rememberPreviousUri('link-types.create.uri');
         }
 
-        return prefixView('admin.link.create', compact('subTitle', 'subTitleIcon'));
+        return view('admin.link.create', compact('subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -115,7 +115,7 @@ class LinkController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('link-types.delete.uri');
 
-        return prefixView('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
+        return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
     }
 
     /**
@@ -165,7 +165,7 @@ class LinkController extends Controller
         }
         $request->session()->forget('link-types.edit.fromUpdate');
 
-        return prefixView('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
+        return view('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
     }
 
     /**
@@ -186,7 +186,7 @@ class LinkController extends Controller
             }
         );
 
-        return prefixView('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
+        return view('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
     }
 
     /**
@@ -204,7 +204,7 @@ class LinkController extends Controller
 
         Log::channel('audit')->info(sprintf('User viewing link type #%d', $linkType->id));
 
-        return prefixView('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
+        return view('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
     }
 
     /**
diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php
index 5e509db1c9..1e9b494c45 100644
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -82,7 +82,7 @@ class UpdateController extends Controller
             'alpha'  => (string)trans('firefly.update_channel_alpha'),
         ];
 
-        return prefixView('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions'));
+        return view('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions'));
     }
 
     /**
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 06608a4df9..1b67554e90 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -79,7 +79,7 @@ class UserController extends Controller
 
         $subTitle = (string)trans('firefly.delete_user', ['email' => $user->email]);
 
-        return prefixView('admin.users.delete', compact('user', 'subTitle'));
+        return view('admin.users.delete', compact('user', 'subTitle'));
     }
 
     /**
@@ -132,7 +132,7 @@ class UserController extends Controller
             'email_changed' => (string)trans('firefly.block_code_email_changed'),
         ];
 
-        return prefixView('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
+        return view('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
     }
 
     /**
@@ -154,7 +154,7 @@ class UserController extends Controller
             }
         );
 
-        return prefixView('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
+        return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
     }
 
     /**
@@ -172,7 +172,7 @@ class UserController extends Controller
         $subTitleIcon  = 'fa-user';
         $information   = $this->repository->getUserData($user);
 
-        return prefixView(
+        return view(
             'admin.users.show',
             compact(
                 'title',
diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php
index 5def400852..0baccde090 100644
--- a/app/Http/Controllers/AttachmentController.php
+++ b/app/Http/Controllers/AttachmentController.php
@@ -79,7 +79,7 @@ class AttachmentController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('attachments.delete.uri');
 
-        return prefixView('attachments.delete', compact('attachment', 'subTitle'));
+        return view('attachments.delete', compact('attachment', 'subTitle'));
     }
 
     /**
@@ -158,7 +158,7 @@ class AttachmentController extends Controller
         ];
         $request->session()->flash('preFilled', $preFilled);
 
-        return prefixView('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
+        return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
     }
 
     /**
@@ -177,7 +177,7 @@ class AttachmentController extends Controller
             }
         );
 
-        return prefixView('attachments.index', compact('set'));
+        return view('attachments.index', compact('set'));
     }
 
     /**
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 24efd8f0cc..bf960ddd66 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -75,7 +75,7 @@ class ForgotPasswordController extends Controller
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
             Log::error($message);
 
-            return prefixView('error', compact('message'));
+            return view('error', compact('message'));
         }
 
 
@@ -117,7 +117,7 @@ class ForgotPasswordController extends Controller
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
-            return prefixView('error', compact('message'));
+            return view('error', compact('message'));
         }
 
         // is allowed to?
@@ -129,6 +129,6 @@ class ForgotPasswordController extends Controller
             $allowRegistration = false;
         }
 
-        return prefixView('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
+        return view('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
     }
 }
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index f59ea53d91..0aaa0917d5 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -251,7 +251,7 @@ class LoginController extends Controller
         }
         $usernameField = $this->username();
 
-        return prefixView('auth.login', compact('allowRegistration', 'email', 'remember', 'ldapWarning', 'allowReset', 'title', 'usernameField'));
+        return view('auth.login', compact('allowRegistration', 'email', 'remember', 'ldapWarning', 'allowReset', 'title', 'usernameField'));
     }
 
     /**
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 1c882813fb..8db7b333e5 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -148,12 +148,12 @@ class RegisterController extends Controller
         if (false === $allowRegistration) {
             $message = 'Registration is currently not available.';
 
-            return prefixView('error', compact('message'));
+            return view('error', compact('message'));
         }
 
         $email = $request->old('email');
 
-        return prefixView('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
+        return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
     }
 
 }
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 0fdf8c8fb3..03095fdbd6 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -85,7 +85,7 @@ class ResetPasswordController extends Controller
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
-            return prefixView('error', compact('message'));
+            return view('error', compact('message'));
         }
         $rules = [
             'token'    => 'required',
@@ -130,7 +130,7 @@ class ResetPasswordController extends Controller
         if ('eloquent' !== $loginProvider) {
             $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
 
-            return prefixView('error', compact('message'));
+            return view('error', compact('message'));
         }
 
         // is allowed to register?
@@ -143,7 +143,7 @@ class ResetPasswordController extends Controller
         }
 
         /** @noinspection PhpUndefinedFieldInspection */
-        return prefixView('auth.passwords.reset')->with(
+        return view('auth.passwords.reset')->with(
             ['token' => $token, 'email' => $request->email, 'allowRegistration' => $allowRegistration, 'pageTitle' => $pageTitle]
         );
     }
diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php
index f574a0978e..c9fdb334f6 100644
--- a/app/Http/Controllers/Auth/TwoFactorController.php
+++ b/app/Http/Controllers/Auth/TwoFactorController.php
@@ -49,7 +49,7 @@ class TwoFactorController extends Controller
         $siteOwner = config('firefly.site_owner');
         $title     = (string)trans('firefly.two_factor_forgot_title');
 
-        return prefixView('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
+        return view('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
     }
 
     /**
diff --git a/app/Http/Controllers/Bill/CreateController.php b/app/Http/Controllers/Bill/CreateController.php
index 67c92d32ba..5eaa4c127b 100644
--- a/app/Http/Controllers/Bill/CreateController.php
+++ b/app/Http/Controllers/Bill/CreateController.php
@@ -88,7 +88,7 @@ class CreateController extends Controller
         }
         $request->session()->forget('bills.create.fromStore');
 
-        return prefixView('bills.create', compact('periods', 'subTitle', 'defaultCurrency'));
+        return view('bills.create', compact('periods', 'subTitle', 'defaultCurrency'));
     }
 
     /**
diff --git a/app/Http/Controllers/Bill/DeleteController.php b/app/Http/Controllers/Bill/DeleteController.php
index 14bb9f25ec..071420027d 100644
--- a/app/Http/Controllers/Bill/DeleteController.php
+++ b/app/Http/Controllers/Bill/DeleteController.php
@@ -75,7 +75,7 @@ class DeleteController extends Controller
         $this->rememberPreviousUri('bills.delete.uri');
         $subTitle = (string)trans('firefly.delete_bill', ['name' => $bill->name]);
 
-        return prefixView('bills.delete', compact('bill', 'subTitle'));
+        return view('bills.delete', compact('bill', 'subTitle'));
     }
 
     /**
diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.php
index 6c1d0916d8..aa9a47b16a 100644
--- a/app/Http/Controllers/Bill/EditController.php
+++ b/app/Http/Controllers/Bill/EditController.php
@@ -107,7 +107,7 @@ class EditController extends Controller
         $request->session()->flash('preFilled', $preFilled);
         $request->session()->forget('bills.edit.fromUpdate');
 
-        return prefixView('bills.edit', compact('subTitle', 'periods', 'rules', 'bill', 'defaultCurrency', 'preFilled'));
+        return view('bills.edit', compact('subTitle', 'periods', 'rules', 'bill', 'defaultCurrency', 'preFilled'));
     }
 
     /**
diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.php
index 88e01a8ad8..d8d7e2d9f2 100644
--- a/app/Http/Controllers/Bill/IndexController.php
+++ b/app/Http/Controllers/Bill/IndexController.php
@@ -137,7 +137,7 @@ class IndexController extends Controller
         $sums   = $this->getSums($bills);
         $totals = $this->getTotals($sums);
 
-        return prefixView('bills.index', compact('bills', 'sums', 'total', 'totals'));
+        return view('bills.index', compact('bills', 'sums', 'total', 'totals'));
     }
 
     /**
diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.php
index 87b3638957..3a42d484ce 100644
--- a/app/Http/Controllers/Bill/ShowController.php
+++ b/app/Http/Controllers/Bill/ShowController.php
@@ -179,7 +179,7 @@ class ShowController extends Controller
         }
 
 
-        return prefixView('bills.show', compact('attachments', 'groups', 'rules', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle'));
+        return view('bills.show', compact('attachments', 'groups', 'rules', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle'));
     }
 
 }
diff --git a/app/Http/Controllers/Budget/AvailableBudgetController.php b/app/Http/Controllers/Budget/AvailableBudgetController.php
index 85c8c1b447..397f87f3c5 100644
--- a/app/Http/Controllers/Budget/AvailableBudgetController.php
+++ b/app/Http/Controllers/Budget/AvailableBudgetController.php
@@ -98,7 +98,7 @@ class AvailableBudgetController extends Controller
         }
         $page = (int)($request->get('page') ?? 1);
 
-        return prefixView('budgets.available-budgets.create', compact('start', 'end', 'page', 'currency'));
+        return view('budgets.available-budgets.create', compact('start', 'end', 'page', 'currency'));
     }
 
     /**
@@ -130,7 +130,7 @@ class AvailableBudgetController extends Controller
         );
         $page       = (int)($request->get('page') ?? 1);
 
-        return prefixView('budgets.available-budgets.create-alternative', compact('start', 'end', 'page', 'currencies'));
+        return view('budgets.available-budgets.create-alternative', compact('start', 'end', 'page', 'currencies'));
     }
 
     /**
@@ -164,7 +164,7 @@ class AvailableBudgetController extends Controller
     {
         $availableBudget->amount = number_format((float)$availableBudget->amount, $availableBudget->transactionCurrency->decimal_places, '.', '');
 
-        return prefixView('budgets.available-budgets.edit', compact('availableBudget', 'start', 'end'));
+        return view('budgets.available-budgets.edit', compact('availableBudget', 'start', 'end'));
     }
 
     /**
diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php
index 8131f59337..edf13e6fbf 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -103,7 +103,7 @@ class BudgetLimitController extends Controller
             }
         );
 
-        return prefixView('budgets.budget-limits.create', compact('start', 'end', 'currencies', 'budget'));
+        return view('budgets.budget-limits.create', compact('start', 'end', 'currencies', 'budget'));
     }
 
     /**
diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php
index 39added774..a7e898f77a 100644
--- a/app/Http/Controllers/Budget/CreateController.php
+++ b/app/Http/Controllers/Budget/CreateController.php
@@ -103,7 +103,7 @@ class CreateController extends Controller
         $request->session()->forget('budgets.create.fromStore');
         $subTitle = (string)trans('firefly.create_new_budget');
 
-        return prefixView('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
+        return view('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
     }
 
     /**
diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php
index 6d7aa47763..43d23a49cb 100644
--- a/app/Http/Controllers/Budget/DeleteController.php
+++ b/app/Http/Controllers/Budget/DeleteController.php
@@ -75,7 +75,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('budgets.delete.uri');
 
-        return prefixView('budgets.delete', compact('budget', 'subTitle'));
+        return view('budgets.delete', compact('budget', 'subTitle'));
     }
 
     /**
diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php
index 58af558d23..1a5c7441b7 100644
--- a/app/Http/Controllers/Budget/EditController.php
+++ b/app/Http/Controllers/Budget/EditController.php
@@ -113,7 +113,7 @@ class EditController extends Controller
         $request->session()->forget('budgets.edit.fromUpdate');
         $request->session()->flash('preFilled', $preFilled);
 
-        return prefixView('budgets.edit', compact('budget', 'subTitle', 'autoBudgetTypes', 'autoBudgetPeriods', 'autoBudget'));
+        return view('budgets.edit', compact('budget', 'subTitle', 'autoBudgetTypes', 'autoBudgetPeriods', 'autoBudget'));
     }
 
     /**
diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php
index 99472da46a..1342b0e36d 100644
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -136,7 +136,7 @@ class IndexController extends Controller
         // get all inactive budgets, and simply list them:
         $inactive = $this->repository->getInactiveBudgets();
 
-        return prefixView(
+        return view(
             'budgets.index', compact(
                                'availableBudgets', 'budgeted', 'spent', 'prevLoop', 'nextLoop', 'budgets', 'currencies', 'enableAddButton', 'periodTitle',
                                'defaultCurrency', 'activeDaysPassed', 'activeDaysLeft', 'inactive', 'budgets', 'start', 'end', 'sums'
diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php
index 87be007853..87c59e756e 100644
--- a/app/Http/Controllers/Budget/ShowController.php
+++ b/app/Http/Controllers/Budget/ShowController.php
@@ -105,7 +105,7 @@ class ShowController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.no-budget'));
 
-        return prefixView('budgets.no-budget', compact('groups', 'subTitle', 'periods', 'start', 'end'));
+        return view('budgets.no-budget', compact('groups', 'subTitle', 'periods', 'start', 'end'));
     }
 
     /**
@@ -133,7 +133,7 @@ class ShowController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('budgets.no-budget'));
 
-        return prefixView('budgets.no-budget', compact('groups', 'subTitle', 'start', 'end'));
+        return view('budgets.no-budget', compact('groups', 'subTitle', 'start', 'end'));
     }
 
     /**
@@ -167,7 +167,7 @@ class ShowController extends Controller
 
         $subTitle = (string)trans('firefly.all_journals_for_budget', ['name' => $budget->name]);
 
-        return prefixView('budgets.show', compact('limits', 'attachments', 'budget', 'repetition', 'groups', 'subTitle'));
+        return view('budgets.show', compact('limits', 'attachments', 'budget', 'repetition', 'groups', 'subTitle'));
     }
 
     /**
@@ -212,6 +212,6 @@ class ShowController extends Controller
         $attachments = $this->repository->getAttachments($budget);
         $limits      = $this->getLimits($budget, $start, $end);
 
-        return prefixView('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
+        return view('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
     }
 }
diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.php
index df8f8a9959..c81dc9df32 100644
--- a/app/Http/Controllers/Category/CreateController.php
+++ b/app/Http/Controllers/Category/CreateController.php
@@ -78,7 +78,7 @@ class CreateController extends Controller
         $request->session()->forget('categories.create.fromStore');
         $subTitle = (string)trans('firefly.create_new_category');
 
-        return prefixView('categories.create', compact('subTitle'));
+        return view('categories.create', compact('subTitle'));
     }
 
     /**
diff --git a/app/Http/Controllers/Category/DeleteController.php b/app/Http/Controllers/Category/DeleteController.php
index 34a4595768..75e3b4b77c 100644
--- a/app/Http/Controllers/Category/DeleteController.php
+++ b/app/Http/Controllers/Category/DeleteController.php
@@ -74,7 +74,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('categories.delete.uri');
 
-        return prefixView('categories.delete', compact('category', 'subTitle'));
+        return view('categories.delete', compact('category', 'subTitle'));
     }
 
     /**
diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.php
index 8b7db90962..ab92c207cb 100644
--- a/app/Http/Controllers/Category/EditController.php
+++ b/app/Http/Controllers/Category/EditController.php
@@ -86,7 +86,7 @@ class EditController extends Controller
             'notes' => $request->old('notes') ?? $this->repository->getNoteText($category),
         ];
 
-        return prefixView('categories.edit', compact('category', 'subTitle', 'preFilled'));
+        return view('categories.edit', compact('category', 'subTitle', 'preFilled'));
     }
 
     /**
diff --git a/app/Http/Controllers/Category/IndexController.php b/app/Http/Controllers/Category/IndexController.php
index 2a3dc289b3..a0bbfd6b00 100644
--- a/app/Http/Controllers/Category/IndexController.php
+++ b/app/Http/Controllers/Category/IndexController.php
@@ -87,7 +87,7 @@ class IndexController extends Controller
         $categories = new LengthAwarePaginator($collection, $total, $pageSize, $page);
         $categories->setPath(route('categories.index'));
 
-        return prefixView('categories.index', compact('categories'));
+        return view('categories.index', compact('categories'));
     }
 
 }
diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php
index 3214089c83..fa681db856 100644
--- a/app/Http/Controllers/Category/NoCategoryController.php
+++ b/app/Http/Controllers/Category/NoCategoryController.php
@@ -104,7 +104,7 @@ class NoCategoryController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('categories.no-category'));
 
-        return prefixView('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
+        return view('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
     }
 
     /**
@@ -139,6 +139,6 @@ class NoCategoryController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath(route('categories.no-category.all'));
 
-        return prefixView('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
+        return view('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
     }
 }
diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php
index 59bb1483e1..80325cdb26 100644
--- a/app/Http/Controllers/Category/ShowController.php
+++ b/app/Http/Controllers/Category/ShowController.php
@@ -107,7 +107,7 @@ class ShowController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
-        return prefixView('categories.show', compact('category', 'attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
+        return view('categories.show', compact('category', 'attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
     }
 
     /**
@@ -146,6 +146,6 @@ class ShowController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
-        return prefixView('categories.show', compact('category', 'attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
+        return view('categories.show', compact('category', 'attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
     }
 }
diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php
index dd0e040bf7..f8e59c9f8e 100644
--- a/app/Http/Controllers/CurrencyController.php
+++ b/app/Http/Controllers/CurrencyController.php
@@ -94,7 +94,7 @@ class CurrencyController extends Controller
 
         Log::channel('audit')->info('Create new currency.');
 
-        return prefixView('currencies.create', compact('subTitleIcon', 'subTitle'));
+        return view('currencies.create', compact('subTitleIcon', 'subTitle'));
     }
 
     /**
@@ -161,7 +161,7 @@ class CurrencyController extends Controller
         $subTitle = (string)trans('form.delete_currency', ['name' => $currency->name]);
         Log::channel('audit')->info(sprintf('Visit page to delete currency %s.', $currency->code));
 
-        return prefixView('currencies.delete', compact('currency', 'subTitle'));
+        return view('currencies.delete', compact('currency', 'subTitle'));
     }
 
     /**
@@ -308,7 +308,7 @@ class CurrencyController extends Controller
         }
         $request->session()->forget('currencies.edit.fromUpdate');
 
-        return prefixView('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon'));
+        return view('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -361,7 +361,7 @@ class CurrencyController extends Controller
             $isOwner = false;
         }
 
-        return prefixView('currencies.index', compact('currencies', 'defaultCurrency', 'isOwner'));
+        return view('currencies.index', compact('currencies', 'defaultCurrency', 'isOwner'));
     }
 
     /**
diff --git a/app/Http/Controllers/Export/IndexController.php b/app/Http/Controllers/Export/IndexController.php
index a196feadcb..192831b30f 100644
--- a/app/Http/Controllers/Export/IndexController.php
+++ b/app/Http/Controllers/Export/IndexController.php
@@ -110,7 +110,7 @@ class IndexController extends Controller
      */
     public function index()
     {
-        return prefixView('export.index');
+        return view('export.index');
     }
 
 }
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 563cb5a534..aaeed19a81 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -141,6 +141,6 @@ class HomeController extends Controller
         $user = auth()->user();
         event(new RequestedVersionCheckStatus($user));
 
-        return prefixView('index', compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today'));
+        return view('index', compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today'));
     }
 }
diff --git a/app/Http/Controllers/Json/FrontpageController.php b/app/Http/Controllers/Json/FrontpageController.php
index f0326ebc99..60bf987c54 100644
--- a/app/Http/Controllers/Json/FrontpageController.php
+++ b/app/Http/Controllers/Json/FrontpageController.php
@@ -66,7 +66,7 @@ class FrontpageController extends Controller
         $html = '';
         if (!empty($info)) {
             try {
-                $html = prefixView('json.piggy-banks', compact('info'))->render();
+                $html = view('json.piggy-banks', compact('info'))->render();
 
             } catch (Throwable $e) { // @phpstan-ignore-line
                 Log::error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage()));
diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php
index eb8d518abe..8a70872254 100644
--- a/app/Http/Controllers/Json/ReconcileController.php
+++ b/app/Http/Controllers/Json/ReconcileController.php
@@ -141,7 +141,7 @@ class ReconcileController extends Controller
         $reconSum = bcadd(bcadd($startBalance, $amount), $clearedAmount);
 
         try {
-            $view = prefixView(
+            $view = view(
                 'accounts.reconcile.overview',
                 compact(
                     'account',
@@ -256,7 +256,7 @@ class ReconcileController extends Controller
         $journals = $this->processTransactions($account, $array);
 
         try {
-            $html = prefixView(
+            $html = view(
                 'accounts.reconcile.transactions',
                 compact('account', 'journals', 'currency', 'start', 'end', 'selectionStart', 'selectionEnd')
             )->render();
diff --git a/app/Http/Controllers/Json/RuleController.php b/app/Http/Controllers/Json/RuleController.php
index 19338c5379..c2e52d35f6 100644
--- a/app/Http/Controllers/Json/RuleController.php
+++ b/app/Http/Controllers/Json/RuleController.php
@@ -50,7 +50,7 @@ class RuleController extends Controller
             $actions[$key] = (string)trans('firefly.rule_action_' . $key . '_choice');
         }
         try {
-            $view = prefixView('rules.partials.action', compact('actions', 'count'))->render();
+            $view = view('rules.partials.action', compact('actions', 'count'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage()));
@@ -81,7 +81,7 @@ class RuleController extends Controller
         asort($triggers);
 
         try {
-            $view = prefixView('rules.partials.trigger', compact('triggers', 'count'))->render();
+            $view = view('rules.partials.trigger', compact('triggers', 'count'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage()));
             $view = 'Could not render view.';
diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php
index f9f74ca719..8409172ef5 100644
--- a/app/Http/Controllers/NewUserController.php
+++ b/app/Http/Controllers/NewUserController.php
@@ -78,7 +78,7 @@ class NewUserController extends Controller
             return redirect(route('index'));
         }
 
-        return prefixView('new-user.index', compact('languages'));
+        return view('new-user.index', compact('languages'));
     }
 
     /**
diff --git a/app/Http/Controllers/ObjectGroup/DeleteController.php b/app/Http/Controllers/ObjectGroup/DeleteController.php
index e019a050b3..fca9f77954 100644
--- a/app/Http/Controllers/ObjectGroup/DeleteController.php
+++ b/app/Http/Controllers/ObjectGroup/DeleteController.php
@@ -74,7 +74,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('object-groups.delete.uri');
 
-        return prefixView('object-groups.delete', compact('objectGroup', 'subTitle', 'piggyBanks'));
+        return view('object-groups.delete', compact('objectGroup', 'subTitle', 'piggyBanks'));
     }
 
     /**
diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.php
index d4e866ee52..74871f8b41 100644
--- a/app/Http/Controllers/ObjectGroup/EditController.php
+++ b/app/Http/Controllers/ObjectGroup/EditController.php
@@ -79,7 +79,7 @@ class EditController extends Controller
         }
         session()->forget('object-groups.edit.fromUpdate');
 
-        return prefixView('object-groups.edit', compact('subTitle', 'subTitleIcon', 'objectGroup'));
+        return view('object-groups.edit', compact('subTitle', 'subTitleIcon', 'objectGroup'));
     }
 
     /**
diff --git a/app/Http/Controllers/ObjectGroup/IndexController.php b/app/Http/Controllers/ObjectGroup/IndexController.php
index 8b846f54cf..02039ed001 100644
--- a/app/Http/Controllers/ObjectGroup/IndexController.php
+++ b/app/Http/Controllers/ObjectGroup/IndexController.php
@@ -71,7 +71,7 @@ class IndexController extends Controller
         $subTitle     = (string)trans('firefly.object_groups_index');
         $objectGroups = $this->repository->get();
 
-        return prefixView('object-groups.index', compact('subTitle', 'objectGroups'));
+        return view('object-groups.index', compact('subTitle', 'objectGroups'));
     }
 
     /**
diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.php
index 29286be025..7de19b79ea 100644
--- a/app/Http/Controllers/PiggyBank/AmountController.php
+++ b/app/Http/Controllers/PiggyBank/AmountController.php
@@ -81,7 +81,7 @@ class AmountController extends Controller
         $maxAmount     = min($leftOnAccount, $leftToSave);
         $currency      = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
-        return prefixView('piggy-banks.add', compact('piggyBank', 'maxAmount', 'currency'));
+        return view('piggy-banks.add', compact('piggyBank', 'maxAmount', 'currency'));
     }
 
     /**
@@ -101,7 +101,7 @@ class AmountController extends Controller
         $maxAmount     = min($leftOnAccount, $leftToSave);
         $currency      = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
-        return prefixView('piggy-banks.add-mobile', compact('piggyBank', 'maxAmount', 'currency'));
+        return view('piggy-banks.add-mobile', compact('piggyBank', 'maxAmount', 'currency'));
     }
 
     /**
@@ -201,7 +201,7 @@ class AmountController extends Controller
         $repetition = $this->piggyRepos->getRepetition($piggyBank);
         $currency   = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
-        return prefixView('piggy-banks.remove', compact('piggyBank', 'repetition', 'currency'));
+        return view('piggy-banks.remove', compact('piggyBank', 'repetition', 'currency'));
     }
 
     /**
@@ -216,6 +216,6 @@ class AmountController extends Controller
         $repetition = $this->piggyRepos->getRepetition($piggyBank);
         $currency   = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
 
-        return prefixView('piggy-banks.remove-mobile', compact('piggyBank', 'repetition', 'currency'));
+        return view('piggy-banks.remove-mobile', compact('piggyBank', 'repetition', 'currency'));
     }
 }
diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php
index ffbdcac015..af55861808 100644
--- a/app/Http/Controllers/PiggyBank/CreateController.php
+++ b/app/Http/Controllers/PiggyBank/CreateController.php
@@ -80,7 +80,7 @@ class CreateController extends Controller
         }
         session()->forget('piggy-banks.create.fromStore');
 
-        return prefixView('piggy-banks.create', compact('subTitle', 'subTitleIcon'));
+        return view('piggy-banks.create', compact('subTitle', 'subTitleIcon'));
     }
 
     /**
diff --git a/app/Http/Controllers/PiggyBank/DeleteController.php b/app/Http/Controllers/PiggyBank/DeleteController.php
index 4f2d8e7456..3782cacd4b 100644
--- a/app/Http/Controllers/PiggyBank/DeleteController.php
+++ b/app/Http/Controllers/PiggyBank/DeleteController.php
@@ -74,7 +74,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('piggy-banks.delete.uri');
 
-        return prefixView('piggy-banks.delete', compact('piggyBank', 'subTitle'));
+        return view('piggy-banks.delete', compact('piggyBank', 'subTitle'));
     }
 
     /**
diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php
index c1c9ac6fcf..3cdefe2e8e 100644
--- a/app/Http/Controllers/PiggyBank/EditController.php
+++ b/app/Http/Controllers/PiggyBank/EditController.php
@@ -101,7 +101,7 @@ class EditController extends Controller
         }
         session()->forget('piggy-banks.edit.fromUpdate');
 
-        return prefixView('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'preFilled'));
+        return view('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'preFilled'));
     }
 
     /**
diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php
index aa0bc13642..3ee182e62f 100644
--- a/app/Http/Controllers/PiggyBank/IndexController.php
+++ b/app/Http/Controllers/PiggyBank/IndexController.php
@@ -136,7 +136,7 @@ class IndexController extends Controller
 
         ksort($piggyBanks);
 
-        return prefixView('piggy-banks.index', compact('piggyBanks', 'accounts'));
+        return view('piggy-banks.index', compact('piggyBanks', 'accounts'));
     }
 
     /**
diff --git a/app/Http/Controllers/PiggyBank/ShowController.php b/app/Http/Controllers/PiggyBank/ShowController.php
index cd14e7fdbc..bb5c71482f 100644
--- a/app/Http/Controllers/PiggyBank/ShowController.php
+++ b/app/Http/Controllers/PiggyBank/ShowController.php
@@ -84,6 +84,6 @@ class ShowController extends Controller
         $subTitle    = $piggyBank->name;
         $attachments = $this->piggyRepos->getAttachments($piggyBank);
 
-        return prefixView('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'piggy', 'attachments'));
+        return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'piggy', 'attachments'));
     }
 }
diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php
index a23d06ec3b..58a877c01c 100644
--- a/app/Http/Controllers/PreferencesController.php
+++ b/app/Http/Controllers/PreferencesController.php
@@ -121,7 +121,7 @@ class PreferencesController extends Controller
             $frontPageAccounts = $accountIds;
         }
 
-        return prefixView(
+        return view(
             'preferences.index',
             compact(
                 'language',
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 449dd65dcf..c2d2a47bda 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -113,7 +113,7 @@ class ProfileController extends Controller
         $subTitle     = (string)trans('firefly.change_your_email');
         $subTitleIcon = 'fa-envelope';
 
-        return prefixView('profile.change-email', compact('title', 'subTitle', 'subTitleIcon', 'email'));
+        return view('profile.change-email', compact('title', 'subTitle', 'subTitleIcon', 'email'));
     }
 
     /**
@@ -135,7 +135,7 @@ class ProfileController extends Controller
         $subTitle     = (string)trans('firefly.change_your_password');
         $subTitleIcon = 'fa-key';
 
-        return prefixView('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
+        return view('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -192,7 +192,7 @@ class ProfileController extends Controller
 
         $image = Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret);
 
-        return prefixView('profile.code', compact('image', 'secret', 'codes'));
+        return view('profile.code', compact('image', 'secret', 'codes'));
     }
 
     /**
@@ -252,7 +252,7 @@ class ProfileController extends Controller
         $subTitle     = (string)trans('firefly.delete_account');
         $subTitleIcon = 'fa-trash';
 
-        return prefixView('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon'));
+        return view('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -340,7 +340,7 @@ class ProfileController extends Controller
             $accessToken = app('preferences')->set('access_token', $token);
         }
 
-        return prefixView(
+        return view(
             'profile.index', compact('subTitle', 'mfaBackupCount', 'userId', 'accessToken', 'enabled2FA', 'isInternalAuth', 'isInternalIdentity')
         );
     }
@@ -356,7 +356,7 @@ class ProfileController extends Controller
             return redirect(route('profile.index'));
         }
 
-        return prefixView('profile.logout-other-sessions');
+        return view('profile.logout-other-sessions');
     }
 
     /**
@@ -385,7 +385,7 @@ class ProfileController extends Controller
         app('preferences')->set('mfa_recovery', $recoveryCodes);
         app('preferences')->mark();
 
-        return prefixView('profile.new-backup-codes', compact('codes'));
+        return view('profile.new-backup-codes', compact('codes'));
     }
 
     /**
diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php
index 1f44183101..fac24c57fe 100644
--- a/app/Http/Controllers/Recurring/CreateController.php
+++ b/app/Http/Controllers/Recurring/CreateController.php
@@ -117,7 +117,7 @@ class CreateController extends Controller
         ];
         $request->session()->flash('preFilled', $preFilled);
 
-        return prefixView(
+        return view(
             'recurring.create',
             compact('tomorrow', 'oldRepetitionType', 'bills', 'weekendResponses', 'preFilled', 'repetitionEnds', 'defaultCurrency', 'budgets')
         );
@@ -211,7 +211,7 @@ class CreateController extends Controller
         }
         $request->session()->flash('preFilled', $preFilled);
 
-        return prefixView(
+        return view(
             'recurring.create',
             compact('tomorrow', 'oldRepetitionType', 'weekendResponses', 'preFilled', 'repetitionEnds', 'defaultCurrency', 'budgets')
         );
diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php
index 6b3fb29014..f40cad7007 100644
--- a/app/Http/Controllers/Recurring/DeleteController.php
+++ b/app/Http/Controllers/Recurring/DeleteController.php
@@ -77,7 +77,7 @@ class DeleteController extends Controller
 
         $journalsCreated = $this->recurring->getTransactions($recurrence)->count();
 
-        return prefixView('recurring.delete', compact('recurrence', 'subTitle', 'journalsCreated'));
+        return view('recurring.delete', compact('recurrence', 'subTitle', 'journalsCreated'));
     }
 
     /**
diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php
index 3ddaafd699..bafbac99fb 100644
--- a/app/Http/Controllers/Recurring/EditController.php
+++ b/app/Http/Controllers/Recurring/EditController.php
@@ -148,7 +148,7 @@ class EditController extends Controller
         $array['repeat_until']            = substr((string)$array['repeat_until'], 0, 10);
         $array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []);
 
-        return prefixView(
+        return view(
             'recurring.edit',
             compact(
                 'recurrence', 'array', 'bills',
diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php
index dfcd70da3c..bf1f1e2842 100644
--- a/app/Http/Controllers/Recurring/IndexController.php
+++ b/app/Http/Controllers/Recurring/IndexController.php
@@ -125,7 +125,7 @@ class IndexController extends Controller
 
         $this->verifyRecurringCronJob();
 
-        return prefixView('recurring.index', compact('paginator', 'today', 'page', 'pageSize', 'total'));
+        return view('recurring.index', compact('paginator', 'today', 'page', 'pageSize', 'total'));
     }
 
 }
diff --git a/app/Http/Controllers/Recurring/ShowController.php b/app/Http/Controllers/Recurring/ShowController.php
index 6622b4dc37..be1ed927b1 100644
--- a/app/Http/Controllers/Recurring/ShowController.php
+++ b/app/Http/Controllers/Recurring/ShowController.php
@@ -96,6 +96,6 @@ class ShowController extends Controller
 
         $subTitle = (string)trans('firefly.overview_for_recurrence', ['title' => $recurrence->title]);
 
-        return prefixView('recurring.show', compact('recurrence', 'subTitle', 'array', 'groups', 'today'));
+        return view('recurring.show', compact('recurrence', 'subTitle', 'array', 'groups', 'today'));
     }
 }
diff --git a/app/Http/Controllers/Report/AccountController.php b/app/Http/Controllers/Report/AccountController.php
index 4765b0990f..bb773e54ba 100644
--- a/app/Http/Controllers/Report/AccountController.php
+++ b/app/Http/Controllers/Report/AccountController.php
@@ -63,7 +63,7 @@ class AccountController extends Controller
         $accountTasker = app(AccountTaskerInterface::class);
         $accountReport = $accountTasker->getAccountReport($accounts, $start, $end);
         try {
-            $result = prefixView('reports.partials.accounts', compact('accountReport'))->render();
+            $result = view('reports.partials.accounts', compact('accountReport'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));
diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php
index 11c04f0cf6..b4c6b37f7b 100644
--- a/app/Http/Controllers/Report/BalanceController.php
+++ b/app/Http/Controllers/Report/BalanceController.php
@@ -136,7 +136,7 @@ class BalanceController extends Controller
             // get transactions in budget
         }
         try {
-            $result = prefixView('reports.partials.balance', compact('report'))->render();
+            $result = view('reports.partials.balance', compact('report'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.balance: %s', $e->getMessage()));
diff --git a/app/Http/Controllers/Report/BillController.php b/app/Http/Controllers/Report/BillController.php
index 3996e4ba5a..e248b12c33 100644
--- a/app/Http/Controllers/Report/BillController.php
+++ b/app/Http/Controllers/Report/BillController.php
@@ -59,7 +59,7 @@ class BillController extends Controller
         $helper = app(ReportHelperInterface::class);
         $report = $helper->getBillReport($accounts, $start, $end);
         try {
-            $result = prefixView('reports.partials.bills', compact('report'))->render();
+            $result = view('reports.partials.bills', compact('report'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));
diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php
index 693518fc67..4f61005931 100644
--- a/app/Http/Controllers/Report/BudgetController.php
+++ b/app/Http/Controllers/Report/BudgetController.php
@@ -96,7 +96,7 @@ class BudgetController extends Controller
         $generator->accountPerBudget();
         $report = $generator->getReport();
 
-        return prefixView('reports.budget.partials.account-per-budget', compact('report', 'budgets'));
+        return view('reports.budget.partials.account-per-budget', compact('report', 'budgets'));
     }
 
     /**
@@ -152,7 +152,7 @@ class BudgetController extends Controller
             }
         }
 
-        return prefixView('reports.budget.partials.accounts', compact('sums', 'report'));
+        return view('reports.budget.partials.accounts', compact('sums', 'report'));
     }
 
     /**
@@ -197,7 +197,7 @@ class BudgetController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = prefixView('reports.budget.partials.avg-expenses', compact('result'))->render();
+            $result = view('reports.budget.partials.avg-expenses', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -272,7 +272,7 @@ class BudgetController extends Controller
             }
         }
 
-        return prefixView('reports.budget.partials.budgets', compact('sums', 'report'));
+        return view('reports.budget.partials.budgets', compact('sums', 'report'));
     }
 
     /**
@@ -297,7 +297,7 @@ class BudgetController extends Controller
         $generator->general();
         $report = $generator->getReport();
 
-        return prefixView('reports.partials.budgets', compact('report'))->render();
+        return view('reports.partials.budgets', compact('report'))->render();
     }
 
     /**
@@ -353,7 +353,7 @@ class BudgetController extends Controller
             }
         }
         try {
-            $result = prefixView('reports.partials.budget-period', compact('report', 'periods'))->render();
+            $result = view('reports.partials.budget-period', compact('report', 'periods'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -405,7 +405,7 @@ class BudgetController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = prefixView('reports.budget.partials.top-expenses', compact('result'))->render();
+            $result = view('reports.budget.partials.top-expenses', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php
index a9643b37f0..41b9193e4c 100644
--- a/app/Http/Controllers/Report/CategoryController.php
+++ b/app/Http/Controllers/Report/CategoryController.php
@@ -162,7 +162,7 @@ class CategoryController extends Controller
             }
         }
 
-        return prefixView('reports.category.partials.account-per-category', compact('report', 'categories'));
+        return view('reports.category.partials.account-per-category', compact('report', 'categories'));
     }
 
     /**
@@ -266,7 +266,7 @@ class CategoryController extends Controller
             }
         }
 
-        return prefixView('reports.category.partials.accounts', compact('sums', 'report'));
+        return view('reports.category.partials.accounts', compact('sums', 'report'));
     }
 
     /**
@@ -311,7 +311,7 @@ class CategoryController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = prefixView('reports.category.partials.avg-expenses', compact('result'))->render();
+            $result = view('reports.category.partials.avg-expenses', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -363,7 +363,7 @@ class CategoryController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = prefixView('reports.category.partials.avg-income', compact('result'))->render();
+            $result = view('reports.category.partials.avg-income', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -478,7 +478,7 @@ class CategoryController extends Controller
             }
         }
 
-        return prefixView('reports.category.partials.categories', compact('sums', 'report'));
+        return view('reports.category.partials.categories', compact('sums', 'report'));
     }
 
     /**
@@ -548,7 +548,7 @@ class CategoryController extends Controller
         $report = $data;
 
         try {
-            $result = prefixView('reports.partials.category-period', compact('report', 'periods'))->render();
+            $result = view('reports.partials.category-period', compact('report', 'periods'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
@@ -628,7 +628,7 @@ class CategoryController extends Controller
         $report = $data;
 
         try {
-            $result = prefixView('reports.partials.category-period', compact('report', 'periods'))->render();
+            $result = view('reports.partials.category-period', compact('report', 'periods'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
@@ -672,7 +672,7 @@ class CategoryController extends Controller
 
 
         try {
-            $result = (string)prefixView('reports.partials.categories', compact('report'))->render();
+            $result = (string)view('reports.partials.categories', compact('report'))->render();
             $cache->store($result);
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
@@ -722,7 +722,7 @@ class CategoryController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = prefixView('reports.category.partials.top-expenses', compact('result'))->render();
+            $result = view('reports.category.partials.top-expenses', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -772,7 +772,7 @@ class CategoryController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = prefixView('reports.category.partials.top-income', compact('result'))->render();
+            $result = view('reports.category.partials.top-income', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
diff --git a/app/Http/Controllers/Report/DoubleController.php b/app/Http/Controllers/Report/DoubleController.php
index d9b1ea40ac..387639f318 100644
--- a/app/Http/Controllers/Report/DoubleController.php
+++ b/app/Http/Controllers/Report/DoubleController.php
@@ -110,7 +110,7 @@ class DoubleController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = prefixView('reports.double.partials.avg-expenses', compact('result'))->render();
+            $result = view('reports.double.partials.avg-expenses', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -162,7 +162,7 @@ class DoubleController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = prefixView('reports.double.partials.avg-income', compact('result'))->render();
+            $result = view('reports.double.partials.avg-income', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -288,7 +288,7 @@ class DoubleController extends Controller
             }
         }
 
-        return prefixView('reports.double.partials.accounts', compact('sums', 'report'));
+        return view('reports.double.partials.accounts', compact('sums', 'report'));
     }
 
     /**
@@ -413,7 +413,7 @@ class DoubleController extends Controller
             }
         }
 
-        return prefixView('reports.double.partials.accounts-per-asset', compact('sums', 'report'));
+        return view('reports.double.partials.accounts-per-asset', compact('sums', 'report'));
     }
 
     /**
@@ -456,7 +456,7 @@ class DoubleController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = prefixView('reports.double.partials.top-expenses', compact('result'))->render();
+            $result = view('reports.double.partials.top-expenses', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -506,7 +506,7 @@ class DoubleController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = prefixView('reports.double.partials.top-income', compact('result'))->render();
+            $result = view('reports.double.partials.top-income', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php
index 7ebe75ef23..9c0a0f1ca0 100644
--- a/app/Http/Controllers/Report/OperationsController.php
+++ b/app/Http/Controllers/Report/OperationsController.php
@@ -83,7 +83,7 @@ class OperationsController extends Controller
         $report = $this->tasker->getExpenseReport($start, $end, $accounts);
         $type   = 'expense-entry';
         try {
-            $result = prefixView('reports.partials.income-expenses', compact('report', 'type'))->render();
+            $result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage()));
@@ -119,7 +119,7 @@ class OperationsController extends Controller
         $report = $this->tasker->getIncomeReport($start, $end, $accounts);
         $type   = 'income-entry';
         try {
-            $result = prefixView('reports.partials.income-expenses', compact('report', 'type'))->render();
+            $result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage()));
@@ -175,7 +175,7 @@ class OperationsController extends Controller
         }
 
         try {
-            $result = prefixView('reports.partials.operations', compact('sums'))->render();
+            $result = view('reports.partials.operations', compact('sums'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.operations: %s', $e->getMessage()));
             $result = 'Could not render view.';
diff --git a/app/Http/Controllers/Report/TagController.php b/app/Http/Controllers/Report/TagController.php
index a44326848b..476f9f8b3f 100644
--- a/app/Http/Controllers/Report/TagController.php
+++ b/app/Http/Controllers/Report/TagController.php
@@ -155,7 +155,7 @@ class TagController extends Controller
             }
         }
 
-        return prefixView('reports.tag.partials.account-per-tag', compact('report', 'tags'));
+        return view('reports.tag.partials.account-per-tag', compact('report', 'tags'));
     }
 
     /**
@@ -259,7 +259,7 @@ class TagController extends Controller
             }
         }
 
-        return prefixView('reports.tag.partials.accounts', compact('sums', 'report'));
+        return view('reports.tag.partials.accounts', compact('sums', 'report'));
     }
 
     /**
@@ -304,7 +304,7 @@ class TagController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = prefixView('reports.tag.partials.avg-expenses', compact('result'))->render();
+            $result = view('reports.tag.partials.avg-expenses', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -356,7 +356,7 @@ class TagController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = prefixView('reports.tag.partials.avg-income', compact('result'))->render();
+            $result = view('reports.tag.partials.avg-income', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -471,7 +471,7 @@ class TagController extends Controller
             }
         }
 
-        return prefixView('reports.tag.partials.tags', compact('sums', 'report'));
+        return view('reports.tag.partials.tags', compact('sums', 'report'));
     }
 
     /**
@@ -514,7 +514,7 @@ class TagController extends Controller
         array_multisort($amounts, SORT_ASC, $result);
 
         try {
-            $result = prefixView('reports.tag.partials.top-expenses', compact('result'))->render();
+            $result = view('reports.tag.partials.top-expenses', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@@ -564,7 +564,7 @@ class TagController extends Controller
         array_multisort($amounts, SORT_DESC, $result);
 
         try {
-            $result = prefixView('reports.tag.partials.top-income', compact('result'))->render();
+            $result = view('reports.tag.partials.top-income', compact('result'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 4dba93dd6c..9f5ad667b8 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -89,7 +89,7 @@ class ReportController extends Controller
     public function auditReport(Collection $accounts, Carbon $start, Carbon $end)
     {
         if ($end < $start) {
-            return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
+            return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
         }
         $this->repository->cleanupBudgets();
 
@@ -125,7 +125,7 @@ class ReportController extends Controller
     public function budgetReport(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end)
     {
         if ($end < $start) {
-            return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
+            return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
         }
         $this->repository->cleanupBudgets();
 
@@ -162,7 +162,7 @@ class ReportController extends Controller
     public function categoryReport(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
     {
         if ($end < $start) {
-            return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
+            return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
         }
         $this->repository->cleanupBudgets();
 
@@ -198,7 +198,7 @@ class ReportController extends Controller
     public function defaultReport(Collection $accounts, Carbon $start, Carbon $end)
     {
         if ($end < $start) {
-            return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
+            return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
         }
 
         $this->repository->cleanupBudgets();
@@ -293,7 +293,7 @@ class ReportController extends Controller
         $accountList = implode(',', $accounts->pluck('id')->toArray());
         $this->repository->cleanupBudgets();
 
-        return prefixView('reports.index', compact('months', 'accounts', 'start', 'accountList', 'groupedAccounts', 'customFiscalYear'));
+        return view('reports.index', compact('months', 'accounts', 'start', 'accountList', 'groupedAccounts', 'customFiscalYear'));
     }
 
     /**
@@ -371,7 +371,7 @@ class ReportController extends Controller
         }
 
         if ($request->getEndDate() < $request->getStartDate()) {
-            return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
+            return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
         }
 
         $uri = match ($reportType) {
@@ -400,7 +400,7 @@ class ReportController extends Controller
     public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
     {
         if ($end < $start) {
-            return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
+            return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
         }
         $this->repository->cleanupBudgets();
 
diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php
index e0915c010e..b0b7e8265b 100644
--- a/app/Http/Controllers/Rule/CreateController.php
+++ b/app/Http/Controllers/Rule/CreateController.php
@@ -126,7 +126,7 @@ class CreateController extends Controller
         }
         session()->forget('rules.create.fromStore');
 
-        return prefixView(
+        return view(
             'rules.rule.create',
             compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle')
         );
@@ -179,7 +179,7 @@ class CreateController extends Controller
         }
         session()->forget('rules.create.fromStore');
 
-        return prefixView(
+        return view(
             'rules.rule.create',
             compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'subTitle')
         );
@@ -229,7 +229,7 @@ class CreateController extends Controller
         }
         session()->forget('rules.create.fromStore');
 
-        return prefixView(
+        return view(
             'rules.rule.create',
             compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'subTitle')
         );
diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php
index aba1d789a3..436e711b25 100644
--- a/app/Http/Controllers/Rule/DeleteController.php
+++ b/app/Http/Controllers/Rule/DeleteController.php
@@ -73,7 +73,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('rules.delete.uri');
 
-        return prefixView('rules.rule.delete', compact('rule', 'subTitle'));
+        return view('rules.rule.delete', compact('rule', 'subTitle'));
     }
 
     /**
diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php
index f225f59ab8..9c6021240c 100644
--- a/app/Http/Controllers/Rule/EditController.php
+++ b/app/Http/Controllers/Rule/EditController.php
@@ -133,7 +133,7 @@ class EditController extends Controller
 
         $request->session()->flash('preFilled', $preFilled);
 
-        return prefixView('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
+        return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
     }
 
     /**
@@ -158,7 +158,7 @@ class EditController extends Controller
         $index = 0;
         foreach ($submittedOperators as $operator) {
             try {
-                $renderedEntries[] = prefixView(
+                $renderedEntries[] = view(
                     'rules.partials.trigger',
                     [
                         'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),
diff --git a/app/Http/Controllers/Rule/IndexController.php b/app/Http/Controllers/Rule/IndexController.php
index 13a130e9b8..98e13cc412 100644
--- a/app/Http/Controllers/Rule/IndexController.php
+++ b/app/Http/Controllers/Rule/IndexController.php
@@ -75,7 +75,7 @@ class IndexController extends Controller
         $this->ruleGroupRepos->resetOrder();
         $ruleGroups = $this->ruleGroupRepos->getAllRuleGroupsWithRules(null);
 
-        return prefixView('rules.index', compact('ruleGroups'));
+        return view('rules.index', compact('ruleGroups'));
     }
 
     /**
diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php
index b5b684fb22..2fc48d7f11 100644
--- a/app/Http/Controllers/Rule/SelectController.php
+++ b/app/Http/Controllers/Rule/SelectController.php
@@ -121,7 +121,7 @@ class SelectController extends Controller
         $today    = Carbon::now()->format('Y-m-d');
         $subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]);
 
-        return prefixView('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));
+        return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));
     }
 
     /**
@@ -175,7 +175,7 @@ class SelectController extends Controller
         // Return json response
         $view = 'ERROR, see logs.';
         try {
-            $view = prefixView('list.journals-array-tiny', ['groups' => $collection])->render();
+            $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
 
         } catch (Throwable $exception) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
@@ -218,7 +218,7 @@ class SelectController extends Controller
         // Return json response
         $view = 'ERROR, see logs.';
         try {
-            $view = prefixView('list.journals-array-tiny', ['groups' => $collection])->render();
+            $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
 
         } catch (Throwable $exception) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage()));
diff --git a/app/Http/Controllers/RuleGroup/CreateController.php b/app/Http/Controllers/RuleGroup/CreateController.php
index 7abaccc79b..65c44183db 100644
--- a/app/Http/Controllers/RuleGroup/CreateController.php
+++ b/app/Http/Controllers/RuleGroup/CreateController.php
@@ -76,7 +76,7 @@ class CreateController extends Controller
         }
         session()->forget('rule-groups.create.fromStore');
 
-        return prefixView('rules.rule-group.create', compact('subTitleIcon', 'subTitle'));
+        return view('rules.rule-group.create', compact('subTitleIcon', 'subTitle'));
     }
 
     /**
diff --git a/app/Http/Controllers/RuleGroup/DeleteController.php b/app/Http/Controllers/RuleGroup/DeleteController.php
index 4fb542ee02..ae87833d8e 100644
--- a/app/Http/Controllers/RuleGroup/DeleteController.php
+++ b/app/Http/Controllers/RuleGroup/DeleteController.php
@@ -75,7 +75,7 @@ class DeleteController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('rule-groups.delete.uri');
 
-        return prefixView('rules.rule-group.delete', compact('ruleGroup', 'subTitle'));
+        return view('rules.rule-group.delete', compact('ruleGroup', 'subTitle'));
     }
 
     /**
diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php
index 9a0532fbb9..cca24c8f57 100644
--- a/app/Http/Controllers/RuleGroup/EditController.php
+++ b/app/Http/Controllers/RuleGroup/EditController.php
@@ -118,7 +118,7 @@ class EditController extends Controller
         session()->forget('rule-groups.edit.fromUpdate');
         session()->flash('preFilled', $preFilled);
 
-        return prefixView('rules.rule-group.edit', compact('ruleGroup', 'subTitle'));
+        return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle'));
     }
 
     /**
diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.php
index 8df7f6f719..4868f9d0b3 100644
--- a/app/Http/Controllers/RuleGroup/ExecutionController.php
+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php
@@ -113,6 +113,6 @@ class ExecutionController extends Controller
         $today    = Carbon::now()->format('Y-m-d');
         $subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
 
-        return prefixView('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle'));
+        return view('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle'));
     }
 }
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index f7bac7cf6b..6eaaed9634 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -91,7 +91,7 @@ class SearchController extends Controller
         $invalidOperators = $searcher->getInvalidOperators();
         $subTitle         = (string)trans('breadcrumbs.search_result', ['query' => $fullQuery]);
 
-        return prefixView('search.index', compact('query', 'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged', 'invalidOperators'));
+        return view('search.index', compact('query', 'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged', 'invalidOperators'));
     }
 
     /**
@@ -118,7 +118,7 @@ class SearchController extends Controller
         $groups->setPath($url);
 
         try {
-            $html = prefixView('search.search', compact('groups', 'hasPages', 'searchTime'))->render();
+            $html = view('search.search', compact('groups', 'hasPages', 'searchTime'))->render();
 
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Cannot render search.search: %s', $e->getMessage()));
diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php
index 9a91f7c2f3..aabaca5514 100644
--- a/app/Http/Controllers/System/InstallController.php
+++ b/app/Http/Controllers/System/InstallController.php
@@ -132,7 +132,7 @@ class InstallController extends Controller
         // set new DB version.
         app('fireflyconfig')->set('db_version', (int)config('firefly.db_version'));
 
-        return prefixView('install.index');
+        return view('install.index');
     }
 
     /**
diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index c6b3278dd2..d7d5c7092c 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -94,7 +94,7 @@ class TagController extends Controller
         }
         session()->forget('tags.create.fromStore');
 
-        return prefixView('tags.create', compact('subTitle', 'subTitleIcon', 'locations'));
+        return view('tags.create', compact('subTitle', 'subTitleIcon', 'locations'));
     }
 
     /**
@@ -111,7 +111,7 @@ class TagController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('tags.delete.uri');
 
-        return prefixView('tags.delete', compact('tag', 'subTitle'));
+        return view('tags.delete', compact('tag', 'subTitle'));
     }
 
     /**
@@ -164,7 +164,7 @@ class TagController extends Controller
         }
         session()->forget('tags.edit.fromUpdate');
 
-        return prefixView('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'locations'));
+        return view('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'locations'));
     }
 
     /**
@@ -192,7 +192,7 @@ class TagController extends Controller
         }
         $count = $repository->count();
 
-        return prefixView('tags.index', compact('tags', 'count'));
+        return view('tags.index', compact('tags', 'count'));
     }
 
     /**
@@ -262,7 +262,7 @@ class TagController extends Controller
         $groups->setPath($path);
         $sums = $this->repository->sumsOfTag($tag, $start, $end);
 
-        return prefixView('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
+        return view('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
     }
 
     /**
@@ -295,7 +295,7 @@ class TagController extends Controller
         $groups->setPath($path);
         $sums = $this->repository->sumsOfTag($tag, $start, $end);
 
-        return prefixView('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
+        return view('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
     }
 
     /**
diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php
index 7038fc2cfa..d1fbce2a75 100644
--- a/app/Http/Controllers/Transaction/BulkController.php
+++ b/app/Http/Controllers/Transaction/BulkController.php
@@ -85,7 +85,7 @@ class BulkController extends Controller
         $budgetRepos = app(BudgetRepositoryInterface::class);
         $budgetList  = app('expandedform')->makeSelectListWithEmpty($budgetRepos->getActiveBudgets());
 
-        return prefixView('transactions.bulk.edit', compact('journals', 'subTitle', 'budgetList'));
+        return view('transactions.bulk.edit', compact('journals', 'subTitle', 'budgetList'));
     }
 
     /**
diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php
index b69f30f399..b27c139266 100644
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -124,7 +124,7 @@ class ConvertController extends Controller
             return redirect(route('transactions.show', [$group->id]));
         }
 
-        return prefixView(
+        return view(
             'transactions.convert',
             compact(
                 'sourceType',
diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php
index 63f5af9352..f57160fed3 100644
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -125,7 +125,7 @@ class CreateController extends Controller
 
         session()->put('preFilled', $preFilled);
 
-        return prefixView(
+        return view(
             'transactions.create',
             compact(
                 'subTitleIcon',
diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php
index 1028a8051e..1b01269edb 100644
--- a/app/Http/Controllers/Transaction/DeleteController.php
+++ b/app/Http/Controllers/Transaction/DeleteController.php
@@ -89,7 +89,7 @@ class DeleteController extends Controller
         Log::debug('Will try to remember previous URI');
         $this->rememberPreviousUri('transactions.delete.uri');
 
-        return prefixView('transactions.delete', compact('group', 'journal', 'subTitle', 'objectType', 'previous'));
+        return view('transactions.delete', compact('group', 'journal', 'subTitle', 'objectType', 'previous'));
     }
 
     /**
diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.php
index 6a68934983..fa755c250b 100644
--- a/app/Http/Controllers/Transaction/EditController.php
+++ b/app/Http/Controllers/Transaction/EditController.php
@@ -85,7 +85,7 @@ class EditController extends Controller
         $search          = sprintf('?%s', $parts['query'] ?? '');
         $previousUrl     = str_replace($search, '', $previousUrl);
 
-        return prefixView(
+        return view(
             'transactions.edit',
             compact(
                 'cash', 'allowedSourceDests', 'expectedSourceTypes', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency',
diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.php
index 45c4a54e15..adc0eaa590 100644
--- a/app/Http/Controllers/Transaction/IndexController.php
+++ b/app/Http/Controllers/Transaction/IndexController.php
@@ -120,7 +120,7 @@ class IndexController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
-        return prefixView('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'periods', 'start', 'end'));
+        return view('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'periods', 'start', 'end'));
     }
 
     /**
@@ -159,6 +159,6 @@ class IndexController extends Controller
         $groups = $collector->getPaginatedGroups();
         $groups->setPath($path);
 
-        return prefixView('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'start', 'end'));
+        return view('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'start', 'end'));
     }
 }
diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index 8aaa065c0f..7f8c3d5c9d 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -79,7 +79,7 @@ class LinkController extends Controller
         $subTitle     = (string)trans('breadcrumbs.delete_journal_link');
         $this->rememberPreviousUri('journal_links.delete.uri');
 
-        return prefixView('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
+        return view('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
     }
 
     /**
@@ -108,7 +108,7 @@ class LinkController extends Controller
     {
         $linkTypes = $this->repository->get();
 
-        return prefixView('transactions.links.modal', compact('journal', 'linkTypes'));
+        return view('transactions.links.modal', compact('journal', 'linkTypes'));
     }
 
     /**
diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php
index b1004c1cdc..5b9fafd21d 100644
--- a/app/Http/Controllers/Transaction/MassController.php
+++ b/app/Http/Controllers/Transaction/MassController.php
@@ -84,7 +84,7 @@ class MassController extends Controller
         // put previous url in session
         $this->rememberPreviousUri('transactions.mass-delete.uri');
 
-        return prefixView('transactions.mass.delete', compact('journals', 'subTitle'));
+        return view('transactions.mass.delete', compact('journals', 'subTitle'));
     }
 
     /**
@@ -153,7 +153,7 @@ class MassController extends Controller
 
         $this->rememberPreviousUri('transactions.mass-edit.uri');
 
-        return prefixView('transactions.mass.edit', compact('journals', 'subTitle', 'withdrawalSources', 'depositDestinations', 'budgets'));
+        return view('transactions.mass.edit', compact('journals', 'subTitle', 'withdrawalSources', 'depositDestinations', 'budgets'));
     }
 
     /**
diff --git a/app/Http/Controllers/Transaction/ShowController.php b/app/Http/Controllers/Transaction/ShowController.php
index 35250933fb..2642bcdf3a 100644
--- a/app/Http/Controllers/Transaction/ShowController.php
+++ b/app/Http/Controllers/Transaction/ShowController.php
@@ -110,7 +110,7 @@ class ShowController extends Controller
         $attachments = $this->repository->getAttachments($transactionGroup);
         $links       = $this->repository->getLinks($transactionGroup);
 
-        return prefixView(
+        return view(
             'transactions.show',
             compact(
                 'transactionGroup',
diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php
index 29c6c04c0a..73651c9fd9 100644
--- a/app/Support/ExpandedForm.php
+++ b/app/Support/ExpandedForm.php
@@ -62,7 +62,7 @@ class ExpandedForm
         //$value = round((float)$value, 8);
         //}
         try {
-            $html = prefixView('form.amount-no-currency', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.amount-no-currency', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render amountNoCurrency(): %s', $e->getMessage()));
             $html = 'Could not render amountNoCurrency.';
@@ -97,7 +97,7 @@ class ExpandedForm
 
         unset($options['placeholder'], $options['autocomplete'], $options['class']);
         try {
-            $html = prefixView('form.checkbox', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.checkbox', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render checkbox(): %s', $e->getMessage()));
             $html = 'Could not render checkbox.';
@@ -121,7 +121,7 @@ class ExpandedForm
         $value   = $this->fillFieldValue($name, $value);
         unset($options['placeholder']);
         try {
-            $html = prefixView('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render date(): %s', $e->getMessage()));
             $html = 'Could not render date.';
@@ -143,7 +143,7 @@ class ExpandedForm
         $options = $this->expandOptionArray($name, $label, $options);
         $classes = $this->getHolderClasses($name);
         try {
-            $html = prefixView('form.file', compact('classes', 'name', 'label', 'options'))->render();
+            $html = view('form.file', compact('classes', 'name', 'label', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render file(): %s', $e->getMessage()));
             $html = 'Could not render file.';
@@ -168,7 +168,7 @@ class ExpandedForm
         $value           = $this->fillFieldValue($name, $value);
         $options['step'] = '1';
         try {
-            $html = prefixView('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render integer(): %s', $e->getMessage()));
             $html = 'Could not render integer.';
@@ -192,7 +192,7 @@ class ExpandedForm
         $classes = $this->getHolderClasses($name);
         $value   = $this->fillFieldValue($name, $value);
         try {
-            $html = prefixView('form.location', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.location', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render location(): %s', $e->getMessage()));
             $html = 'Could not render location.';
@@ -250,7 +250,7 @@ class ExpandedForm
             //            $value = round((float)$value, $selectedCurrency->decimal_places);
         }
         try {
-            $html = prefixView('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render nonSelectableAmount(): %s', $e->getMessage()));
             $html = 'Could not render nonSelectableAmount.';
@@ -275,7 +275,7 @@ class ExpandedForm
         $options['step'] = 'any';
         unset($options['placeholder']);
         try {
-            $html = prefixView('form.number', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.number', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render number(): %s', $e->getMessage()));
             $html = 'Could not render number.';
@@ -304,7 +304,7 @@ class ExpandedForm
         }
 
         try {
-            $html = prefixView('form.object_group', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.object_group', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render objectGroup(): %s', $e->getMessage()));
             $html = 'Could not render objectGroup.';
@@ -323,7 +323,7 @@ class ExpandedForm
     public function optionsList(string $type, string $name): string
     {
         try {
-            $html = prefixView('form.options', compact('type', 'name'))->render();
+            $html = view('form.options', compact('type', 'name'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render select(): %s', $e->getMessage()));
             $html = 'Could not render optionsList.';
@@ -345,7 +345,7 @@ class ExpandedForm
         $options = $this->expandOptionArray($name, $label, $options);
         $classes = $this->getHolderClasses($name);
         try {
-            $html = prefixView('form.password', compact('classes', 'name', 'label', 'options'))->render();
+            $html = view('form.password', compact('classes', 'name', 'label', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render password(): %s', $e->getMessage()));
             $html = 'Could not render password.';
@@ -372,7 +372,7 @@ class ExpandedForm
         $options['step'] = 'any';
         unset($options['placeholder']);
         try {
-            $html = prefixView('form.percentage', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.percentage', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render percentage(): %s', $e->getMessage()));
             $html = 'Could not render percentage.';
@@ -394,7 +394,7 @@ class ExpandedForm
         $options = $this->expandOptionArray($name, $label, $options);
         $classes = $this->getHolderClasses($name);
         try {
-            $html = prefixView('form.static', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.static', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render staticText(): %s', $e->getMessage()));
             $html = 'Could not render staticText.';
@@ -417,7 +417,7 @@ class ExpandedForm
         $classes = $this->getHolderClasses($name);
         $value   = $this->fillFieldValue($name, $value);
         try {
-            $html = prefixView('form.text', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.text', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render text(): %s', $e->getMessage()));
             $html = 'Could not render text.';
@@ -446,7 +446,7 @@ class ExpandedForm
         }
 
         try {
-            $html = prefixView('form.textarea', compact('classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.textarea', compact('classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render textarea(): %s', $e->getMessage()));
             $html = 'Could not render textarea.';
diff --git a/app/Support/Form/AccountForm.php b/app/Support/Form/AccountForm.php
index 74102fb38a..c51d2770dc 100644
--- a/app/Support/Form/AccountForm.php
+++ b/app/Support/Form/AccountForm.php
@@ -136,7 +136,7 @@ class AccountForm
 
         unset($options['class']);
         try {
-            $html = prefixView('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render();
+            $html = view('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render assetAccountCheckList(): %s', $e->getMessage()));
             $html = 'Could not render assetAccountCheckList.';
diff --git a/app/Support/Form/CurrencyForm.php b/app/Support/Form/CurrencyForm.php
index 54bc0a6597..619ed23cf5 100644
--- a/app/Support/Form/CurrencyForm.php
+++ b/app/Support/Form/CurrencyForm.php
@@ -95,7 +95,7 @@ class CurrencyForm
             $value = round((float)$value, $defaultCurrency->decimal_places);
         }
         try {
-            $html = prefixView('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage()));
             $html = 'Could not render currencyField.';
@@ -164,7 +164,7 @@ class CurrencyForm
             $value = round((float)$value, $defaultCurrency->decimal_places);
         }
         try {
-            $html = prefixView('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
+            $html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage()));
             $html = 'Could not render currencyField.';
diff --git a/app/Support/Form/FormSupport.php b/app/Support/Form/FormSupport.php
index c6c720cc44..df9f3cd928 100644
--- a/app/Support/Form/FormSupport.php
+++ b/app/Support/Form/FormSupport.php
@@ -53,7 +53,7 @@ trait FormSupport
         $selected = $this->fillFieldValue($name, $selected);
         unset($options['autocomplete'], $options['placeholder']);
         try {
-            $html = prefixView('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
+            $html = view('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render select(): %s', $e->getMessage()));
             $html = 'Could not render select.';
diff --git a/app/Support/Http/Controllers/ModelInformation.php b/app/Support/Http/Controllers/ModelInformation.php
index 57fe491464..27cb567527 100644
--- a/app/Support/Http/Controllers/ModelInformation.php
+++ b/app/Support/Http/Controllers/ModelInformation.php
@@ -48,7 +48,7 @@ trait ModelInformation
     protected function getActionsForBill(Bill $bill): array // get info and augument
     {
         try {
-            $result = prefixView(
+            $result = view(
                 'rules.partials.action',
                 [
                     'oldAction'  => 'link_to_bill',
@@ -136,7 +136,7 @@ trait ModelInformation
         ];
         foreach ($billTriggers as $index => $trigger) {
             try {
-                $string = prefixView(
+                $string = view(
                     'rules.partials.trigger',
                     [
                         'oldTrigger' => $trigger,
@@ -252,7 +252,7 @@ trait ModelInformation
 
         foreach ($journalTriggers as $index => $trigger) {
             try {
-                $string = prefixView(
+                $string = view(
                     'rules.partials.trigger',
                     [
                         'oldTrigger' => $trigger,
diff --git a/app/Support/Http/Controllers/RenderPartialViews.php b/app/Support/Http/Controllers/RenderPartialViews.php
index ad177f8c37..a6dec719a8 100644
--- a/app/Support/Http/Controllers/RenderPartialViews.php
+++ b/app/Support/Http/Controllers/RenderPartialViews.php
@@ -67,7 +67,7 @@ trait RenderPartialViews
         $journals = $popupHelper->balanceForBudget($budget, $account, $attributes);
 
         try {
-            $view = prefixView('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render();
+            $view = view('popup.report.balance-amount', compact('journals', 'budget', 'account'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render: %s', $e->getMessage()));
             $view = 'Firefly III could not render the view. Please see the log files.';
@@ -88,7 +88,7 @@ trait RenderPartialViews
         $budgets    = $repository->getBudgets();
 
         try {
-            $result = prefixView('reports.options.budget', compact('budgets'))->render();
+            $result = view('reports.options.budget', compact('budgets'))->render();
         } catch (Throwable $e) {// @phpstan-ignore-line
             Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
             $result = 'Could not render view.';
@@ -119,7 +119,7 @@ trait RenderPartialViews
         $journals = $popupHelper->byBudget($budget, $attributes);
 
         try {
-            $view = prefixView('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
+            $view = view('popup.report.budget-spent-amount', compact('journals', 'budget'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render: %s', $e->getMessage()));
             $view = 'Firefly III could not render the view. Please see the log files.';
@@ -146,7 +146,7 @@ trait RenderPartialViews
         $journals           = $popupHelper->byCategory($category, $attributes);
 
         try {
-            $view = prefixView('popup.report.category-entry', compact('journals', 'category'))->render();
+            $view = view('popup.report.category-entry', compact('journals', 'category'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render: %s', $e->getMessage()));
             $view = 'Firefly III could not render the view. Please see the log files.';
@@ -167,7 +167,7 @@ trait RenderPartialViews
         $categories = $repository->getCategories();
 
         try {
-            $result = prefixView('reports.options.category', compact('categories'))->render();
+            $result = view('reports.options.category', compact('categories'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Cannot render reports.options.category: %s', $e->getMessage()));
             $result = 'Could not render view.';
@@ -208,7 +208,7 @@ trait RenderPartialViews
 
 
         try {
-            $result = prefixView('reports.options.double', compact('set'))->render();
+            $result = view('reports.options.double', compact('set'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
             $result = 'Could not render view.';
@@ -241,7 +241,7 @@ trait RenderPartialViews
         $journals = $popupHelper->byExpenses($account, $attributes);
 
         try {
-            $view = prefixView('popup.report.expense-entry', compact('journals', 'account'))->render();
+            $view = view('popup.report.expense-entry', compact('journals', 'account'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render: %s', $e->getMessage()));
             $view = 'Firefly III could not render the view. Please see the log files.';
@@ -267,7 +267,7 @@ trait RenderPartialViews
         foreach ($currentActions as $entry) {
             $count = ($index + 1);
             try {
-                $actions[] = prefixView(
+                $actions[] = view(
                     'rules.partials.action',
                     [
                         'oldAction'  => $entry->action_type,
@@ -317,7 +317,7 @@ trait RenderPartialViews
             if ('user_action' !== $entry->trigger_type) {
                 $count = ($index + 1);
                 try {
-                    $renderedEntries[] = prefixView(
+                    $renderedEntries[] = view(
                         'rules.partials.trigger',
                         [
                             'oldTrigger' => OperatorQuerySearch::getRootOperator($entry->trigger_type),
@@ -363,7 +363,7 @@ trait RenderPartialViews
         $journals = $popupHelper->byIncome($account, $attributes);
 
         try {
-            $view = prefixView('popup.report.income-entry', compact('journals', 'account'))->render();
+            $view = view('popup.report.income-entry', compact('journals', 'account'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render: %s', $e->getMessage()));
             $view = 'Firefly III could not render the view. Please see the log files.';
@@ -381,7 +381,7 @@ trait RenderPartialViews
     {
 
         try {
-            $result = prefixView('reports.options.no-options')->render();
+            $result = view('reports.options.no-options')->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Cannot render reports.options.no-options: %s', $e->getMessage()));
             $result = 'Could not render view.';
@@ -403,7 +403,7 @@ trait RenderPartialViews
 
 
         try {
-            $result = prefixView('reports.options.tag', compact('tags'))->render();
+            $result = view('reports.options.tag', compact('tags'))->render();
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Cannot render reports.options.tag: %s', $e->getMessage()));
             $result = 'Could not render view.';
diff --git a/app/Support/Http/Controllers/RuleManagement.php b/app/Support/Http/Controllers/RuleManagement.php
index 53bbc1300b..bc84899558 100644
--- a/app/Support/Http/Controllers/RuleManagement.php
+++ b/app/Support/Http/Controllers/RuleManagement.php
@@ -50,7 +50,7 @@ trait RuleManagement
         if (is_array($oldInput)) {
             foreach ($oldInput as $oldAction) {
                 try {
-                    $triggers[] = prefixView(
+                    $triggers[] = view(
                         'rules.partials.action',
                         [
                             'oldAction'  => $oldAction['type'],
@@ -95,7 +95,7 @@ trait RuleManagement
         if (is_array($oldInput)) {
             foreach ($oldInput as $oldTrigger) {
                 try {
-                    $renderedEntries[] = prefixView(
+                    $renderedEntries[] = view(
                         'rules.partials.trigger',
                         [
                             'oldTrigger' => OperatorQuerySearch::getRootOperator($oldTrigger['type']),
@@ -138,7 +138,7 @@ trait RuleManagement
         $index = 0;
         foreach ($submittedOperators as $operator) {
             try {
-                $renderedEntries[] = prefixView(
+                $renderedEntries[] = view(
                     'rules.partials.trigger',
                     [
                         'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 3b5d3d0789..0fd478deb3 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -66,43 +66,6 @@ if (!function_exists('str_is_equal')) {
     }
 }
 
-if (!function_exists('prefixView')) {
-    /**
-     * Get the evaluated view contents for the given view.
-     *
-     * @param string|null                                   $view
-     * @param \Illuminate\Contracts\Support\Arrayable|array $data
-     * @param array                                         $mergeData
-     *
-     * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
-     */
-    function prefixView($view = null, $data = [], $mergeData = [])
-    {
-        $factory = app(ViewFactory::class);
-
-        if (func_num_args() === 0) {
-            return $factory;
-        }
-        // original view:
-        $prefixView = $view;
-
-        // try to find the view file first:
-        if(!$factory->exists($prefixView)) {
-            // prepend it with the view in the layout:
-            $layout = env('FIREFLY_III_LAYOUT', 'v1');
-            $prefixView   = sprintf('%s.%s', $layout, $view);
-
-            // try again:
-            if(!$factory->exists($prefixView)) {
-                // if does not exist, force v1 and just continue.
-                $prefixView   = sprintf('%s.%s', 'v1', $view);
-            }
-        }
-
-        return $factory->make($prefixView, $data, $mergeData);
-    }
-}
-
 $app = new Illuminate\Foundation\Application(
     realpath(__DIR__ . '/../')
 );