diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php
index fe7fc48898..c0bff5d7af 100644
--- a/app/Http/Controllers/Account/CreateController.php
+++ b/app/Http/Controllers/Account/CreateController.php
@@ -56,7 +56,7 @@ final class CreateController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-credit-card');
+            app('view')->share('mainTitleIcon', 'bi-credit-card');
             app('view')->share('title', (string) trans('firefly.accounts'));
 
             $this->repository  = app(AccountRepositoryInterface::class);
diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php
index 5e13b797d6..1472f0b55f 100644
--- a/app/Http/Controllers/Account/DeleteController.php
+++ b/app/Http/Controllers/Account/DeleteController.php
@@ -51,7 +51,7 @@ final class DeleteController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-credit-card');
+            app('view')->share('mainTitleIcon', 'bi-credit-card');
             app('view')->share('title', (string) trans('firefly.accounts'));
 
             $this->repository = app(AccountRepositoryInterface::class);
diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php
index 04feabe670..1f7a7edbac 100644
--- a/app/Http/Controllers/Account/EditController.php
+++ b/app/Http/Controllers/Account/EditController.php
@@ -59,7 +59,7 @@ final class EditController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-credit-card');
+            app('view')->share('mainTitleIcon', 'bi-credit-card');
             app('view')->share('title', (string) trans('firefly.accounts'));
 
             $this->repository  = app(AccountRepositoryInterface::class);
diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php
index a9cf2a027b..390495c26d 100644
--- a/app/Http/Controllers/Account/ReconcileController.php
+++ b/app/Http/Controllers/Account/ReconcileController.php
@@ -62,7 +62,7 @@ final class ReconcileController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-credit-card');
+            app('view')->share('mainTitleIcon', 'bi-credit-card');
             app('view')->share('title', (string) trans('firefly.accounts'));
             $this->repository   = app(JournalRepositoryInterface::class);
             $this->accountRepos = app(AccountRepositoryInterface::class);
diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php
index fa04aee5c8..bd52caa976 100644
--- a/app/Http/Controllers/Account/ShowController.php
+++ b/app/Http/Controllers/Account/ShowController.php
@@ -65,7 +65,7 @@ final class ShowController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-credit-card');
+            app('view')->share('mainTitleIcon', 'bi-credit-card');
             app('view')->share('title', (string) trans('firefly.accounts'));
 
             $this->repository = app(AccountRepositoryInterface::class);
diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php
index 37562b1dd2..8135b14527 100644
--- a/app/Http/Controllers/Admin/ConfigurationController.php
+++ b/app/Http/Controllers/Admin/ConfigurationController.php
@@ -47,7 +47,7 @@ final class ConfigurationController extends Controller
 
         $this->middleware(static function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.system_settings'));
-            app('view')->share('mainTitleIcon', 'fa-hand-spock-o');
+            app('view')->share('mainTitleIcon', 'bi-cpu');
 
             return $next($request);
         });
@@ -62,7 +62,7 @@ final class ConfigurationController extends Controller
     public function index(): Factory|\Illuminate\Contracts\View\View
     {
         $subTitle              = (string) trans('firefly.instance_configuration');
-        $subTitleIcon          = 'fa-wrench';
+        $subTitleIcon          = 'bi-wrench';
 
         Log::channel('audit')->info('User visits admin config index.');
 
diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php
index 34ee63ece0..3c5047d85b 100644
--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -58,7 +58,7 @@ final class HomeController extends Controller
     {
         Log::channel('audit')->info('User visits admin index.');
         $title         = (string) trans('firefly.system_settings');
-        $mainTitleIcon = 'fa-hand-spock-o';
+        $mainTitleIcon = 'bi-cpu';
         $email         = auth()->user()->email;
         $pref          = Preferences::get('remote_guard_alt_email');
         if (null !== $pref && is_string($pref->data)) {
diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php
index 2bafa6e09c..6de0d908d6 100644
--- a/app/Http/Controllers/Admin/LinkController.php
+++ b/app/Http/Controllers/Admin/LinkController.php
@@ -52,7 +52,7 @@ final class LinkController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.system_settings'));
-            app('view')->share('mainTitleIcon', 'fa-hand-spock-o');
+            app('view')->share('mainTitleIcon', 'bi-cpu');
             $this->repository = app(LinkTypeRepositoryInterface::class);
 
             return $next($request);
@@ -70,7 +70,7 @@ final class LinkController extends Controller
         Log::channel('audit')->info('User visits link index.');
 
         $subTitle     = (string) trans('firefly.create_new_link_type');
-        $subTitleIcon = 'fa-link';
+        $subTitleIcon = 'bi-link';
 
         // put previous url in session if not redirect from store (not "create another").
         if (true !== session('link-types.create.fromStore')) {
@@ -142,7 +142,7 @@ final class LinkController extends Controller
             return redirect(route('settings.links.index'));
         }
         $subTitle     = (string) trans('firefly.edit_link_type', ['name' => $linkType->name]);
-        $subTitleIcon = 'fa-link';
+        $subTitleIcon = 'bi-link';
 
         Log::channel('audit')->info(sprintf('User wants to edit link type #%d', $linkType->id));
 
@@ -163,7 +163,7 @@ final class LinkController extends Controller
     public function index(): Factory|\Illuminate\Contracts\View\View
     {
         $subTitle     = (string) trans('firefly.journal_link_configuration');
-        $subTitleIcon = 'fa-link';
+        $subTitleIcon = 'bi-link';
         $linkTypes    = $this->repository->get();
 
         Log::channel('audit')->info('User on index of link types in admin.');
@@ -182,7 +182,7 @@ final class LinkController extends Controller
     public function show(LinkType $linkType): Factory|\Illuminate\Contracts\View\View
     {
         $subTitle     = (string) trans('firefly.overview_for_link', ['name' => $linkType->name]);
-        $subTitleIcon = 'fa-link';
+        $subTitleIcon = 'bi-link';
         $links        = $this->repository->getJournalLinks($linkType);
 
         Log::channel('audit')->info(sprintf('User viewing link type #%d', $linkType->id));
diff --git a/app/Http/Controllers/Admin/NotificationController.php b/app/Http/Controllers/Admin/NotificationController.php
index c00996b531..56c5230358 100644
--- a/app/Http/Controllers/Admin/NotificationController.php
+++ b/app/Http/Controllers/Admin/NotificationController.php
@@ -40,7 +40,7 @@ final class NotificationController extends Controller
     {
         Log::channel('audit')->info('User visits notifications index.');
         $title                          = (string) trans('firefly.system_settings');
-        $mainTitleIcon                  = 'fa-hand-spock-o';
+        $mainTitleIcon                  = 'bi-cpu';
         $subTitle                       = (string) trans('firefly.title_owner_notifications');
         $subTitleIcon                   = 'envelope-o';
 
diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php
index acc8249ab0..e4d373b585 100644
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Http/Controllers/Admin/UpdateController.php
@@ -48,7 +48,7 @@ final class UpdateController extends Controller
         parent::__construct();
         $this->middleware(static function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.system_settings'));
-            app('view')->share('mainTitleIcon', 'fa-hand-spock-o');
+            app('view')->share('mainTitleIcon', 'bi-cpu');
 
             return $next($request);
         });
@@ -63,7 +63,7 @@ final class UpdateController extends Controller
     public function index(): Factory|\Illuminate\Contracts\View\View
     {
         $subTitle        = (string) trans('firefly.update_check_title');
-        $subTitleIcon    = 'fa-star';
+        $subTitleIcon    = 'bi-star';
         $permission      = AppConfiguration::get('permission_update_check', -1);
         $channel         = AppConfiguration::get('update_channel', 'stable');
         $selected        = $permission->data;
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 4200d93089..343cfe5629 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -60,7 +60,7 @@ final class UserController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.system_settings'));
-            app('view')->share('mainTitleIcon', 'fa-hand-spock-o');
+            app('view')->share('mainTitleIcon', 'bi-cpu');
             $this->repository = app(UserRepositoryInterface::class);
 
             return $next($request);
@@ -132,7 +132,7 @@ final class UserController extends Controller
         session()->forget('users.edit.fromUpdate');
 
         $subTitle       = (string) trans('firefly.edit_user', ['email' => $user->email]);
-        $subTitleIcon   = 'fa-user-o';
+        $subTitleIcon   = 'bi-person';
         $currentUser    = auth()->user();
         $isAdmin        = $this->repository->hasRole($user, 'owner');
         $codes          = [
@@ -165,7 +165,7 @@ final class UserController extends Controller
     public function index(): Factory|\Illuminate\Contracts\View\View
     {
         $subTitle       = (string) trans('firefly.user_administration');
-        $subTitleIcon   = 'fa-users';
+        $subTitleIcon   = 'bi-people';
         $users          = $this->repository->all();
         $singleUserMode = (bool) AppConfiguration::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
         $allowInvites   = false;
@@ -211,9 +211,9 @@ final class UserController extends Controller
     public function show(User $user): Factory|\Illuminate\Contracts\View\View
     {
         $title         = (string) trans('firefly.system_settings');
-        $mainTitleIcon = 'fa-hand-spock-o';
+        $mainTitleIcon = 'bi-cpu';
         $subTitle      = (string) trans('firefly.single_user_administration', ['email' => $user->email]);
-        $subTitleIcon  = 'fa-user';
+        $subTitleIcon  = 'bi-person';
         $information   = $this->repository->getUserData($user);
 
         return view('settings.users.show', [
diff --git a/app/Http/Controllers/Bill/CreateController.php b/app/Http/Controllers/Bill/CreateController.php
index 48c3e970cd..b44147bb72 100644
--- a/app/Http/Controllers/Bill/CreateController.php
+++ b/app/Http/Controllers/Bill/CreateController.php
@@ -53,7 +53,7 @@ final class CreateController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.bills'));
-            app('view')->share('mainTitleIcon', 'fa-calendar-o');
+            app('view')->share('mainTitleIcon', 'bi-calendar');
             $this->attachments = app(AttachmentHelperInterface::class);
             $this->repository  = app(BillRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/Bill/DeleteController.php b/app/Http/Controllers/Bill/DeleteController.php
index 5a819264c9..10f7ed70a5 100644
--- a/app/Http/Controllers/Bill/DeleteController.php
+++ b/app/Http/Controllers/Bill/DeleteController.php
@@ -51,7 +51,7 @@ final class DeleteController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.bills'));
-            app('view')->share('mainTitleIcon', 'fa-calendar-o');
+            app('view')->share('mainTitleIcon', 'bi-calendar');
             $this->repository = app(BillRepositoryInterface::class);
 
             return $next($request);
diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.php
index dc8e568571..d053b72ff6 100644
--- a/app/Http/Controllers/Bill/EditController.php
+++ b/app/Http/Controllers/Bill/EditController.php
@@ -54,7 +54,7 @@ final class EditController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.bills'));
-            app('view')->share('mainTitleIcon', 'fa-calendar-o');
+            app('view')->share('mainTitleIcon', 'bi-calendar');
             $this->attachments = app(AttachmentHelperInterface::class);
             $this->repository  = app(BillRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.php
index b1fd70231a..110ea3d5bd 100644
--- a/app/Http/Controllers/Bill/IndexController.php
+++ b/app/Http/Controllers/Bill/IndexController.php
@@ -59,7 +59,7 @@ final class IndexController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.bills'));
-            app('view')->share('mainTitleIcon', 'fa-calendar-o');
+            app('view')->share('mainTitleIcon', 'bi-calendar');
             $this->repository = app(BillRepositoryInterface::class);
 
             return $next($request);
diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.php
index e18b0fe316..0c93f487f0 100644
--- a/app/Http/Controllers/Bill/ShowController.php
+++ b/app/Http/Controllers/Bill/ShowController.php
@@ -66,7 +66,7 @@ final class ShowController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.bills'));
-            app('view')->share('mainTitleIcon', 'fa-calendar-o');
+            app('view')->share('mainTitleIcon', 'bi-calendar');
             $this->repository = app(BillRepositoryInterface::class);
 
             return $next($request);
diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php
index ed36a6f3a2..de7337738f 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -69,7 +69,7 @@ final class BudgetLimitController extends Controller
         parent::__construct();
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.budgets'));
-            app('view')->share('mainTitleIcon', 'fa-pie-chart');
+            app('view')->share('mainTitleIcon', 'bi-pie-chart');
             $this->repository    = app(BudgetRepositoryInterface::class);
             $this->opsRepository = app(OperationsRepositoryInterface::class);
             $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php
index 54ed922262..4de785a6e8 100644
--- a/app/Http/Controllers/Budget/CreateController.php
+++ b/app/Http/Controllers/Budget/CreateController.php
@@ -53,7 +53,7 @@ final class CreateController extends Controller
         parent::__construct();
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.budgets'));
-            app('view')->share('mainTitleIcon', 'fa-pie-chart');
+            app('view')->share('mainTitleIcon', 'bi-pie-chart');
             $this->repository  = app(BudgetRepositoryInterface::class);
             $this->attachments = app(AttachmentHelperInterface::class);
 
diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php
index 156dcefcc0..6ae5687093 100644
--- a/app/Http/Controllers/Budget/DeleteController.php
+++ b/app/Http/Controllers/Budget/DeleteController.php
@@ -50,7 +50,7 @@ final class DeleteController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.budgets'));
-            app('view')->share('mainTitleIcon', 'fa-pie-chart');
+            app('view')->share('mainTitleIcon', 'bi-pie-chart');
             $this->repository = app(BudgetRepositoryInterface::class);
 
             return $next($request);
diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php
index e95fcb466e..a5ee96d87c 100644
--- a/app/Http/Controllers/Budget/EditController.php
+++ b/app/Http/Controllers/Budget/EditController.php
@@ -56,7 +56,7 @@ final class EditController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.budgets'));
-            app('view')->share('mainTitleIcon', 'fa-pie-chart');
+            app('view')->share('mainTitleIcon', 'bi-pie-chart');
             $this->repository  = app(BudgetRepositoryInterface::class);
             $this->attachments = app(AttachmentHelperInterface::class);
 
diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php
index bda5f31e0c..62db3e127d 100644
--- a/app/Http/Controllers/Budget/ShowController.php
+++ b/app/Http/Controllers/Budget/ShowController.php
@@ -63,7 +63,7 @@ final class ShowController extends Controller
         parent::__construct();
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.budgets'));
-            app('view')->share('mainTitleIcon', 'fa-pie-chart');
+            app('view')->share('mainTitleIcon', 'bi-pie-chart');
             $this->journalRepos = app(JournalRepositoryInterface::class);
             $this->repository   = app(BudgetRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.php
index f2c629cd97..b81594479d 100644
--- a/app/Http/Controllers/Category/CreateController.php
+++ b/app/Http/Controllers/Category/CreateController.php
@@ -53,7 +53,7 @@ final class CreateController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.categories'));
-            app('view')->share('mainTitleIcon', 'fa-bookmark');
+            app('view')->share('mainTitleIcon', 'bi-bookmark');
             $this->repository  = app(CategoryRepositoryInterface::class);
             $this->attachments = app(AttachmentHelperInterface::class);
 
diff --git a/app/Http/Controllers/Category/DeleteController.php b/app/Http/Controllers/Category/DeleteController.php
index 0a7be08309..d4e0e62f32 100644
--- a/app/Http/Controllers/Category/DeleteController.php
+++ b/app/Http/Controllers/Category/DeleteController.php
@@ -50,7 +50,7 @@ final class DeleteController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.categories'));
-            app('view')->share('mainTitleIcon', 'fa-bookmark');
+            app('view')->share('mainTitleIcon', 'bi-bookmark');
             $this->repository = app(CategoryRepositoryInterface::class);
 
             return $next($request);
diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.php
index 68e7b8092d..30a5e4f6c6 100644
--- a/app/Http/Controllers/Category/EditController.php
+++ b/app/Http/Controllers/Category/EditController.php
@@ -53,7 +53,7 @@ final class EditController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.categories'));
-            app('view')->share('mainTitleIcon', 'fa-bookmark');
+            app('view')->share('mainTitleIcon', 'bi-bookmark');
             $this->repository  = app(CategoryRepositoryInterface::class);
             $this->attachments = app(AttachmentHelperInterface::class);
 
diff --git a/app/Http/Controllers/Category/IndexController.php b/app/Http/Controllers/Category/IndexController.php
index 81392addd8..6e7ecf9f15 100644
--- a/app/Http/Controllers/Category/IndexController.php
+++ b/app/Http/Controllers/Category/IndexController.php
@@ -53,7 +53,7 @@ final class IndexController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.categories'));
-            app('view')->share('mainTitleIcon', 'fa-bookmark');
+            app('view')->share('mainTitleIcon', 'bi-bookmark');
             $this->repository = app(CategoryRepositoryInterface::class);
 
             return $next($request);
diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php
index 87d5a22b84..0146ee30f1 100644
--- a/app/Http/Controllers/Category/NoCategoryController.php
+++ b/app/Http/Controllers/Category/NoCategoryController.php
@@ -60,7 +60,7 @@ final class NoCategoryController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.categories'));
-            app('view')->share('mainTitleIcon', 'fa-bookmark');
+            app('view')->share('mainTitleIcon', 'bi-bookmark');
             $this->journalRepos = app(JournalRepositoryInterface::class);
 
             return $next($request);
diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php
index 45a893ab31..c9e3b0ecfa 100644
--- a/app/Http/Controllers/Category/ShowController.php
+++ b/app/Http/Controllers/Category/ShowController.php
@@ -59,7 +59,7 @@ final class ShowController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.categories'));
-            app('view')->share('mainTitleIcon', 'fa-bookmark');
+            app('view')->share('mainTitleIcon', 'bi-bookmark');
             $this->repository = app(CategoryRepositoryInterface::class);
 
             return $next($request);
@@ -82,7 +82,7 @@ final class ShowController extends Controller
 
         /** @var Carbon $start */
         /** @var Carbon $end */
-        $subTitleIcon = 'fa-bookmark';
+        $subTitleIcon = 'bi-bookmark';
         $page         = (int) $request->input('page');
         $page   = min(max(1, $page), 2 ** 16);
         $attachments  = $this->repository->getAttachments($category);
@@ -134,7 +134,7 @@ final class ShowController extends Controller
     public function showAll(Request $request, Category $category): Factory|\Illuminate\Contracts\View\View
     {
         // default values:
-        $subTitleIcon = 'fa-bookmark';
+        $subTitleIcon = 'bi-bookmark';
         $page         = (int) $request->input('page');
         $page   = min(max(1, $page), 2 ** 16);
         $pageSize     = (int) Preferences::get('listPageSize', 50)->data;
diff --git a/app/Http/Controllers/ExchangeRates/IndexController.php b/app/Http/Controllers/ExchangeRates/IndexController.php
index 8e46598105..25aba55b17 100644
--- a/app/Http/Controllers/ExchangeRates/IndexController.php
+++ b/app/Http/Controllers/ExchangeRates/IndexController.php
@@ -41,7 +41,7 @@ final class IndexController extends Controller
 
         // translations:
         $this->middleware(static function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-exchange');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
             app('view')->share('title', (string) trans('firefly.header_exchange_rates'));
 
             return $next($request);
diff --git a/app/Http/Controllers/Export/IndexController.php b/app/Http/Controllers/Export/IndexController.php
index 9bfc47e90f..6d916b9a0b 100644
--- a/app/Http/Controllers/Export/IndexController.php
+++ b/app/Http/Controllers/Export/IndexController.php
@@ -53,7 +53,7 @@ final class IndexController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-life-bouy');
+            app('view')->share('mainTitleIcon', 'bi-upload');
             app('view')->share('title', (string) trans('firefly.export_data_title'));
             $this->journalRepository = app(JournalRepositoryInterface::class);
             $this->middleware(IsDemoUser::class)->except(['index']);
diff --git a/app/Http/Controllers/Json/BudgetController.php b/app/Http/Controllers/Json/BudgetController.php
index 3f58237c10..8402aaa183 100644
--- a/app/Http/Controllers/Json/BudgetController.php
+++ b/app/Http/Controllers/Json/BudgetController.php
@@ -55,7 +55,7 @@ final class BudgetController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.budgets'));
-            app('view')->share('mainTitleIcon', 'fa-pie-chart');
+            app('view')->share('mainTitleIcon', 'bi-pie-chart');
             $this->repository   = app(BudgetRepositoryInterface::class);
             $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
             $this->blRepository = app(BudgetLimitRepositoryInterface::class);
diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php
index 2384f50920..ddd7cc05d2 100644
--- a/app/Http/Controllers/Json/ReconcileController.php
+++ b/app/Http/Controllers/Json/ReconcileController.php
@@ -55,7 +55,7 @@ final class ReconcileController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-credit-card');
+            app('view')->share('mainTitleIcon', 'bi-credit-card');
             app('view')->share('title', (string) trans('firefly.accounts'));
             $this->accountRepos = app(AccountRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/ObjectGroup/DeleteController.php b/app/Http/Controllers/ObjectGroup/DeleteController.php
index 6ec65c24da..29a6c9268e 100644
--- a/app/Http/Controllers/ObjectGroup/DeleteController.php
+++ b/app/Http/Controllers/ObjectGroup/DeleteController.php
@@ -47,7 +47,7 @@ final class DeleteController extends Controller
         parent::__construct();
 
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-envelope-o');
+            app('view')->share('mainTitleIcon', 'bi-envelope');
             app('view')->share('title', (string) trans('firefly.object_groups_page_title'));
 
             $this->repository = app(ObjectGroupRepositoryInterface::class);
diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.php
index c309c3b890..7e967d28b4 100644
--- a/app/Http/Controllers/ObjectGroup/EditController.php
+++ b/app/Http/Controllers/ObjectGroup/EditController.php
@@ -48,7 +48,7 @@ final class EditController extends Controller
         parent::__construct();
 
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-envelope-o');
+            app('view')->share('mainTitleIcon', 'bi-envelope');
             app('view')->share('title', (string) trans('firefly.object_groups_page_title'));
 
             $this->repository = app(ObjectGroupRepositoryInterface::class);
diff --git a/app/Http/Controllers/ObjectGroup/IndexController.php b/app/Http/Controllers/ObjectGroup/IndexController.php
index 39789ac056..a19c0b7994 100644
--- a/app/Http/Controllers/ObjectGroup/IndexController.php
+++ b/app/Http/Controllers/ObjectGroup/IndexController.php
@@ -49,7 +49,7 @@ final class IndexController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-envelope-o');
+            app('view')->share('mainTitleIcon', 'bi-envelope');
             app('view')->share('title', (string) trans('firefly.object_groups_page_title'));
             $this->repository = app(ObjectGroupRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.php
index fc1c125019..560a12a317 100644
--- a/app/Http/Controllers/PiggyBank/AmountController.php
+++ b/app/Http/Controllers/PiggyBank/AmountController.php
@@ -53,7 +53,7 @@ final class AmountController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.piggyBanks'));
-            app('view')->share('mainTitleIcon', 'fa-bullseye');
+            app('view')->share('mainTitleIcon', 'bi-target');
 
             $this->piggyRepos = app(PiggyBankRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php
index cef6f6f8a2..8c935f19bb 100644
--- a/app/Http/Controllers/PiggyBank/CreateController.php
+++ b/app/Http/Controllers/PiggyBank/CreateController.php
@@ -53,7 +53,7 @@ final class CreateController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.piggyBanks'));
-            app('view')->share('mainTitleIcon', 'fa-bullseye');
+            app('view')->share('mainTitleIcon', 'bi-target');
 
             $this->attachments = app(AttachmentHelperInterface::class);
             $this->piggyRepos  = app(PiggyBankRepositoryInterface::class);
@@ -70,7 +70,7 @@ final class CreateController extends Controller
     public function create(Request $request): Factory|\Illuminate\Contracts\View\View
     {
         $subTitle     = (string) trans('firefly.new_piggy_bank');
-        $subTitleIcon = 'fa-plus';
+        $subTitleIcon = 'bi-plus';
         $request->old('_token');
         $preFilled    = $request->old();
         if (!array_key_exists('transaction_currency_id', $preFilled)) {
diff --git a/app/Http/Controllers/PiggyBank/DeleteController.php b/app/Http/Controllers/PiggyBank/DeleteController.php
index dd29ee11fa..b7237297f1 100644
--- a/app/Http/Controllers/PiggyBank/DeleteController.php
+++ b/app/Http/Controllers/PiggyBank/DeleteController.php
@@ -48,7 +48,7 @@ final class DeleteController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.piggyBanks'));
-            app('view')->share('mainTitleIcon', 'fa-bullseye');
+            app('view')->share('mainTitleIcon', 'bi-target');
 
             $this->piggyRepos = app(PiggyBankRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php
index 39b58c2a06..3be6f01a49 100644
--- a/app/Http/Controllers/PiggyBank/EditController.php
+++ b/app/Http/Controllers/PiggyBank/EditController.php
@@ -53,7 +53,7 @@ final class EditController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.piggyBanks'));
-            app('view')->share('mainTitleIcon', 'fa-bullseye');
+            app('view')->share('mainTitleIcon', 'bi-target');
 
             $this->attachments = app(AttachmentHelperInterface::class);
             $this->piggyRepos  = app(PiggyBankRepositoryInterface::class);
diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php
index fc571cd0b4..34e67be816 100644
--- a/app/Http/Controllers/PiggyBank/IndexController.php
+++ b/app/Http/Controllers/PiggyBank/IndexController.php
@@ -60,7 +60,7 @@ final class IndexController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.piggyBanks'));
-            app('view')->share('mainTitleIcon', 'fa-bullseye');
+            app('view')->share('mainTitleIcon', 'bi-target');
 
             $this->piggyRepos = app(PiggyBankRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/PiggyBank/ShowController.php b/app/Http/Controllers/PiggyBank/ShowController.php
index ce445646e2..204b1d467e 100644
--- a/app/Http/Controllers/PiggyBank/ShowController.php
+++ b/app/Http/Controllers/PiggyBank/ShowController.php
@@ -52,7 +52,7 @@ final class ShowController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.piggyBanks'));
-            app('view')->share('mainTitleIcon', 'fa-bullseye');
+            app('view')->share('mainTitleIcon', 'bi-target');
 
             $this->piggyRepos = app(PiggyBankRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/Profile/MfaController.php b/app/Http/Controllers/Profile/MfaController.php
index 7a23b7839b..bf909709d5 100644
--- a/app/Http/Controllers/Profile/MfaController.php
+++ b/app/Http/Controllers/Profile/MfaController.php
@@ -70,7 +70,7 @@ final class MfaController extends Controller
 
         $this->middleware(static function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.profile'));
-            app('view')->share('mainTitleIcon', 'fa-user');
+            app('view')->share('mainTitleIcon', 'bi-person');
 
             return $next($request);
         });
@@ -141,7 +141,7 @@ final class MfaController extends Controller
             return redirect(route('profile.index'));
         }
         $subTitle     = (string) trans('firefly.mfa_index_title');
-        $subTitleIcon = 'fa-calculator';
+        $subTitleIcon = 'bi-calculator';
 
         return view('profile.mfa.disable-mfa')->with(['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'enabledMFA' => $enabledMFA]);
     }
@@ -282,7 +282,7 @@ final class MfaController extends Controller
         }
 
         $subTitle     = (string) trans('firefly.mfa_index_title');
-        $subTitleIcon = 'fa-calculator';
+        $subTitleIcon = 'bi-calculator';
         $enabledMFA   = null !== auth()->user()->mfa_secret;
 
         return view('profile.mfa.index')->with(['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'enabledMFA' => $enabledMFA]);
diff --git a/app/Http/Controllers/Profile/OAuthController.php b/app/Http/Controllers/Profile/OAuthController.php
index d7818919be..ce024cb6f2 100644
--- a/app/Http/Controllers/Profile/OAuthController.php
+++ b/app/Http/Controllers/Profile/OAuthController.php
@@ -52,7 +52,7 @@ final class OAuthController extends Controller
 
         $this->middleware(static function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.oauth_tokens'));
-            app('view')->share('mainTitleIcon', 'fa-user');
+            app('view')->share('mainTitleIcon', 'bi-person');
 
             return $next($request);
         });
diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php
index 570f4a4ad8..9f928275b3 100644
--- a/app/Http/Controllers/Recurring/CreateController.php
+++ b/app/Http/Controllers/Recurring/CreateController.php
@@ -60,7 +60,7 @@ final class CreateController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-paint-brush');
+            app('view')->share('mainTitleIcon', 'bi-paint-bucket');
             app('view')->share('title', (string) trans('firefly.recurrences'));
             app('view')->share('subTitle', (string) trans('firefly.create_new_recurrence'));
 
diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php
index 2417c4ed42..fbbb44f8c4 100644
--- a/app/Http/Controllers/Recurring/DeleteController.php
+++ b/app/Http/Controllers/Recurring/DeleteController.php
@@ -49,7 +49,7 @@ final class DeleteController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-paint-brush');
+            app('view')->share('mainTitleIcon', 'bi-paint-bucket');
             app('view')->share('title', (string) trans('firefly.recurrences'));
 
             $this->repository = app(RecurringRepositoryInterface::class);
diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php
index 66b9f3b5bc..82b124f1ea 100644
--- a/app/Http/Controllers/Recurring/EditController.php
+++ b/app/Http/Controllers/Recurring/EditController.php
@@ -64,7 +64,7 @@ final class EditController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-paint-brush');
+            app('view')->share('mainTitleIcon', 'bi-paint-bucket');
             app('view')->share('title', (string) trans('firefly.recurrences'));
             app('view')->share('subTitle', (string) trans('firefly.recurrences'));
 
diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php
index 0f9d3214fc..8d77470286 100644
--- a/app/Http/Controllers/Recurring/IndexController.php
+++ b/app/Http/Controllers/Recurring/IndexController.php
@@ -59,7 +59,7 @@ final class IndexController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-paint-brush');
+            app('view')->share('mainTitleIcon', 'bi-paint-bucket');
             app('view')->share('title', (string) trans('firefly.recurrences'));
 
             $this->repository = app(RecurringRepositoryInterface::class);
diff --git a/app/Http/Controllers/Recurring/ShowController.php b/app/Http/Controllers/Recurring/ShowController.php
index 985959628e..cd7ebf8c21 100644
--- a/app/Http/Controllers/Recurring/ShowController.php
+++ b/app/Http/Controllers/Recurring/ShowController.php
@@ -59,7 +59,7 @@ final class ShowController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-paint-brush');
+            app('view')->share('mainTitleIcon', 'bi-paint-bucket');
             app('view')->share('title', (string) trans('firefly.recurrences'));
 
             $this->repository = app(RecurringRepositoryInterface::class);
diff --git a/app/Http/Controllers/Recurring/TriggerController.php b/app/Http/Controllers/Recurring/TriggerController.php
index de0445debc..cda039fbe5 100644
--- a/app/Http/Controllers/Recurring/TriggerController.php
+++ b/app/Http/Controllers/Recurring/TriggerController.php
@@ -51,7 +51,7 @@ final class TriggerController extends Controller
 
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-paint-brush');
+            app('view')->share('mainTitleIcon', 'bi-paint-bucket');
             app('view')->share('title', (string) trans('firefly.recurrences'));
 
             $this->repository = app(RecurringRepositoryInterface::class);
diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php
index 14e0189bbf..893d3ae443 100644
--- a/app/Http/Controllers/Rule/CreateController.php
+++ b/app/Http/Controllers/Rule/CreateController.php
@@ -61,7 +61,7 @@ final class CreateController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.rules'));
-            app('view')->share('mainTitleIcon', 'fa-random');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             $this->ruleRepos = app(RuleRepositoryInterface::class);
 
@@ -115,7 +115,7 @@ final class CreateController extends Controller
 
         $triggerCount = count($oldTriggers);
         $actionCount  = count($oldActions);
-        $subTitleIcon = 'fa-clone';
+        $subTitleIcon = 'bi-copy';
 
         // title depends on whether or not there is a rule group:
         $subTitle     = (string) trans('firefly.make_new_rule_no_group');
@@ -176,7 +176,7 @@ final class CreateController extends Controller
 
         $triggerCount = count($oldTriggers);
         $actionCount  = count($oldActions);
-        $subTitleIcon = 'fa-clone';
+        $subTitleIcon = 'bi-copy';
 
         // title depends on whether there is a rule group:
         $subTitle     = (string) trans('firefly.make_new_rule_no_group');
@@ -208,7 +208,7 @@ final class CreateController extends Controller
     {
         $request->session()->flash('info', (string) trans('firefly.instructions_rule_from_journal', ['name' => e($journal->description)]));
 
-        $subTitleIcon = 'fa-clone';
+        $subTitleIcon = 'bi-copy';
         $subTitle     = (string) trans('firefly.make_new_rule_no_group');
 
         // get triggers and actions for journal.
diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php
index 4975c863c3..4f5c7e71fa 100644
--- a/app/Http/Controllers/Rule/DeleteController.php
+++ b/app/Http/Controllers/Rule/DeleteController.php
@@ -49,7 +49,7 @@ final class DeleteController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.rules'));
-            app('view')->share('mainTitleIcon', 'fa-random');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             $this->ruleRepos = app(RuleRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php
index 297ce0295d..8920bbdafa 100644
--- a/app/Http/Controllers/Rule/EditController.php
+++ b/app/Http/Controllers/Rule/EditController.php
@@ -60,7 +60,7 @@ final class EditController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.rules'));
-            app('view')->share('mainTitleIcon', 'fa-random');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             $this->ruleRepos = app(RuleRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/Rule/IndexController.php b/app/Http/Controllers/Rule/IndexController.php
index 2c2a56165c..3e5714bc4a 100644
--- a/app/Http/Controllers/Rule/IndexController.php
+++ b/app/Http/Controllers/Rule/IndexController.php
@@ -53,7 +53,7 @@ final class IndexController extends Controller
         parent::__construct();
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.rules'));
-            app('view')->share('mainTitleIcon', 'fa-random');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
             $this->ruleGroupRepos = app(RuleGroupRepositoryInterface::class);
             $this->ruleRepos      = app(RuleRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php
index edaf7c3428..88c8bd7f29 100644
--- a/app/Http/Controllers/Rule/SelectController.php
+++ b/app/Http/Controllers/Rule/SelectController.php
@@ -58,7 +58,7 @@ final class SelectController extends Controller
 
         $this->middleware(static function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.rules'));
-            app('view')->share('mainTitleIcon', 'fa-random');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             return $next($request);
         });
diff --git a/app/Http/Controllers/RuleGroup/CreateController.php b/app/Http/Controllers/RuleGroup/CreateController.php
index a2d5bc7edc..ce950365c9 100644
--- a/app/Http/Controllers/RuleGroup/CreateController.php
+++ b/app/Http/Controllers/RuleGroup/CreateController.php
@@ -49,7 +49,7 @@ final class CreateController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.rules'));
-            app('view')->share('mainTitleIcon', 'fa-random');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             $this->repository = app(RuleGroupRepositoryInterface::class);
 
@@ -64,7 +64,7 @@ final class CreateController extends Controller
      */
     public function create(): Factory|\Illuminate\Contracts\View\View
     {
-        $subTitleIcon = 'fa-clone';
+        $subTitleIcon = 'bi-copy';
         $subTitle     = (string) trans('firefly.make_new_rule_group');
 
         // put previous url in session if not redirect from store (not "create another").
diff --git a/app/Http/Controllers/RuleGroup/DeleteController.php b/app/Http/Controllers/RuleGroup/DeleteController.php
index fb81cdcd88..f1eb7a050f 100644
--- a/app/Http/Controllers/RuleGroup/DeleteController.php
+++ b/app/Http/Controllers/RuleGroup/DeleteController.php
@@ -50,7 +50,7 @@ final class DeleteController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.rules'));
-            app('view')->share('mainTitleIcon', 'fa-random');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             $this->repository = app(RuleGroupRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php
index 9feaa858bf..a10cbd9366 100644
--- a/app/Http/Controllers/RuleGroup/EditController.php
+++ b/app/Http/Controllers/RuleGroup/EditController.php
@@ -51,7 +51,7 @@ final class EditController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.rules'));
-            app('view')->share('mainTitleIcon', 'fa-random');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             $this->repository = app(RuleGroupRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.php
index ee4018050a..22d24c5fb6 100644
--- a/app/Http/Controllers/RuleGroup/ExecutionController.php
+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php
@@ -56,7 +56,7 @@ final class ExecutionController extends Controller
         $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.rules'));
-            app('view')->share('mainTitleIcon', 'fa-random');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
             $this->repository->setUser(auth()->user());
             $this->ruleGroupRepository->setUser(auth()->user());
 
diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php
index cbb95da28f..bf4f8ea6b1 100644
--- a/app/Http/Controllers/Transaction/BulkController.php
+++ b/app/Http/Controllers/Transaction/BulkController.php
@@ -57,7 +57,7 @@ final class BulkController extends Controller
         $this->middleware(function ($request, $next) {
             $this->repository = app(JournalRepositoryInterface::class);
             app('view')->share('title', (string) trans('firefly.transactions'));
-            app('view')->share('mainTitleIcon', 'fa-exchange');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             return $next($request);
         });
diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php
index 6784d8af0f..967217c71e 100644
--- a/app/Http/Controllers/Transaction/ConvertController.php
+++ b/app/Http/Controllers/Transaction/ConvertController.php
@@ -75,7 +75,7 @@ final class ConvertController extends Controller
         $this->middleware(function ($request, $next) {
             $this->accountRepository = app(AccountRepositoryInterface::class);
             app('view')->share('title', (string) trans('firefly.transactions'));
-            app('view')->share('mainTitleIcon', 'fa-exchange');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             return $next($request);
         });
@@ -104,7 +104,7 @@ final class ConvertController extends Controller
         $groupTitle           = $group->title ?? $first->description;
         $groupArray           = $transformer->transformObject($group);
         $subTitle             = (string) trans('firefly.convert_to_'.$destinationType->type, ['description' => $groupTitle]);
-        $subTitleIcon         = 'fa-exchange';
+        $subTitleIcon         = 'bi-shuffle';
 
         // get a list of asset accounts and liabilities and stuff, in various combinations:
         $validDepositSources  = $this->getValidDepositSources();
diff --git a/app/Http/Controllers/Transaction/CreateController.php b/app/Http/Controllers/Transaction/CreateController.php
index 7dd84ddced..46595819d8 100644
--- a/app/Http/Controllers/Transaction/CreateController.php
+++ b/app/Http/Controllers/Transaction/CreateController.php
@@ -57,7 +57,7 @@ final class CreateController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.transactions'));
-            app('view')->share('mainTitleIcon', 'fa-exchange');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
             $this->repository = app(TransactionGroupRepositoryInterface::class);
 
             return $next($request);
@@ -111,7 +111,7 @@ final class CreateController extends Controller
         $cash                       = $accountRepository->getCashAccount();
         $preFilled                  = session()->has('preFilled') ? session('preFilled') : [];
         $subTitle                   = (string) trans(sprintf('breadcrumbs.create_%s', strtolower((string) $objectType)));
-        $subTitleIcon               = 'fa-plus';
+        $subTitleIcon               = 'bi-plus';
 
         /** @var null|array $optionalFields */
         $optionalFields             = Preferences::get('transaction_journal_optional_fields', [])->data;
diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php
index 36618791b6..cd736d6863 100644
--- a/app/Http/Controllers/Transaction/DeleteController.php
+++ b/app/Http/Controllers/Transaction/DeleteController.php
@@ -53,7 +53,7 @@ final class DeleteController extends Controller
         // translations:
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.transactions'));
-            app('view')->share('mainTitleIcon', 'fa-exchange');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             $this->repository = app(TransactionGroupRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.php
index 1ce11526f5..82ce53ae56 100644
--- a/app/Http/Controllers/Transaction/EditController.php
+++ b/app/Http/Controllers/Transaction/EditController.php
@@ -59,7 +59,7 @@ final class EditController extends Controller
         // translations:
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.transactions'));
-            app('view')->share('mainTitleIcon', 'fa-exchange');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             $this->repository = app(JournalRepositoryInterface::class);
 
@@ -92,7 +92,7 @@ final class EditController extends Controller
             ? $transactionGroup->title
             : $transactionGroup->transactionJournals()->first()->description;
         $subTitle                   = (string) trans('firefly.edit_transaction_title', ['description' => $title]);
-        $subTitleIcon               = 'fa-plus';
+        $subTitleIcon               = 'bi-plus';
         $cash                       = $repository->getCashAccount();
         $previousUrl                = $this->rememberPreviousUrl('transactions.edit.url');
         $parts                      = parse_url((string) $previousUrl);
diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.php
index 7035fb88ca..b1bea92fe1 100644
--- a/app/Http/Controllers/Transaction/IndexController.php
+++ b/app/Http/Controllers/Transaction/IndexController.php
@@ -56,7 +56,7 @@ final class IndexController extends Controller
         app('view')->share('showCategory', true);
         // translations:
         $this->middleware(function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-exchange');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
             app('view')->share('title', (string) trans('firefly.transactions'));
 
             $this->repository = app(JournalRepositoryInterface::class);
diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php
index 3ef3ff5e76..5008a0d160 100644
--- a/app/Http/Controllers/Transaction/LinkController.php
+++ b/app/Http/Controllers/Transaction/LinkController.php
@@ -54,7 +54,7 @@ final class LinkController extends Controller
         // some useful repositories:
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.transactions'));
-            app('view')->share('mainTitleIcon', 'fa-exchange');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             $this->journalRepository = app(JournalRepositoryInterface::class);
             $this->repository        = app(LinkTypeRepositoryInterface::class);
@@ -70,7 +70,7 @@ final class LinkController extends Controller
      */
     public function delete(TransactionJournalLink $link): Factory|\Illuminate\Contracts\View\View
     {
-        $subTitleIcon = 'fa-link';
+        $subTitleIcon = 'bi-link';
         $subTitle     = (string) trans('breadcrumbs.delete_journal_link');
         $this->rememberPreviousUrl('journal_links.delete.url');
 
diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php
index 08c5c76f9f..d49e745fd7 100644
--- a/app/Http/Controllers/Transaction/MassController.php
+++ b/app/Http/Controllers/Transaction/MassController.php
@@ -63,7 +63,7 @@ final class MassController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.transactions'));
-            app('view')->share('mainTitleIcon', 'fa-exchange');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
             $this->repository = app(JournalRepositoryInterface::class);
 
             return $next($request);
diff --git a/app/Http/Controllers/Transaction/ShowController.php b/app/Http/Controllers/Transaction/ShowController.php
index b4c31f48e1..6f4d1c3f17 100644
--- a/app/Http/Controllers/Transaction/ShowController.php
+++ b/app/Http/Controllers/Transaction/ShowController.php
@@ -61,7 +61,7 @@ final class ShowController extends Controller
             $this->aleRepository = app(ALERepositoryInterface::class);
 
             app('view')->share('title', (string) trans('firefly.transactions'));
-            app('view')->share('mainTitleIcon', 'fa-exchange');
+            app('view')->share('mainTitleIcon', 'bi-shuffle');
 
             return $next($request);
         });
diff --git a/app/Http/Controllers/TransactionCurrency/CreateController.php b/app/Http/Controllers/TransactionCurrency/CreateController.php
index 02216045d3..5c9c2ac084 100644
--- a/app/Http/Controllers/TransactionCurrency/CreateController.php
+++ b/app/Http/Controllers/TransactionCurrency/CreateController.php
@@ -55,7 +55,7 @@ final class CreateController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.currencies'));
-            app('view')->share('mainTitleIcon', 'fa-usd');
+            app('view')->share('mainTitleIcon', 'bi-currency-euro');
             $this->repository     = app(CurrencyRepositoryInterface::class);
             $this->userRepository = app(UserRepositoryInterface::class);
 
@@ -78,7 +78,7 @@ final class CreateController extends Controller
             return redirect(route('currencies.index'));
         }
 
-        $subTitleIcon = 'fa-plus';
+        $subTitleIcon = 'bi-plus';
         $subTitle     = (string) trans('firefly.create_currency');
 
         // put previous url in session if not redirect from store (not "create another").
diff --git a/app/Http/Controllers/TransactionCurrency/DeleteController.php b/app/Http/Controllers/TransactionCurrency/DeleteController.php
index 124dc0c95a..fe15c5cd77 100644
--- a/app/Http/Controllers/TransactionCurrency/DeleteController.php
+++ b/app/Http/Controllers/TransactionCurrency/DeleteController.php
@@ -54,7 +54,7 @@ final class DeleteController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.currencies'));
-            app('view')->share('mainTitleIcon', 'fa-usd');
+            app('view')->share('mainTitleIcon', 'bi-currency-euro');
             $this->repository     = app(CurrencyRepositoryInterface::class);
             $this->userRepository = app(UserRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/TransactionCurrency/EditController.php b/app/Http/Controllers/TransactionCurrency/EditController.php
index 7eca55a893..02564e1687 100644
--- a/app/Http/Controllers/TransactionCurrency/EditController.php
+++ b/app/Http/Controllers/TransactionCurrency/EditController.php
@@ -53,7 +53,7 @@ final class EditController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.currencies'));
-            app('view')->share('mainTitleIcon', 'fa-usd');
+            app('view')->share('mainTitleIcon', 'bi-currency-euro');
             $this->repository     = app(CurrencyRepositoryInterface::class);
             $this->userRepository = app(UserRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/TransactionCurrency/IndexController.php b/app/Http/Controllers/TransactionCurrency/IndexController.php
index 6f64769b9a..1f10dbd174 100644
--- a/app/Http/Controllers/TransactionCurrency/IndexController.php
+++ b/app/Http/Controllers/TransactionCurrency/IndexController.php
@@ -51,7 +51,7 @@ final class IndexController extends Controller
 
         $this->middleware(function ($request, $next) {
             app('view')->share('title', (string) trans('firefly.currencies'));
-            app('view')->share('mainTitleIcon', 'fa-usd');
+            app('view')->share('mainTitleIcon', 'bi-currency-euro');
             $this->repository     = app(CurrencyRepositoryInterface::class);
             $this->userRepository = app(UserRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/UserGroup/CreateController.php b/app/Http/Controllers/UserGroup/CreateController.php
index 2e77cb33bf..e6f53d184d 100644
--- a/app/Http/Controllers/UserGroup/CreateController.php
+++ b/app/Http/Controllers/UserGroup/CreateController.php
@@ -39,7 +39,7 @@ final class CreateController extends Controller
     {
         $title         = (string) trans('firefly.administrations_page_title');
         $subTitle      = (string) trans('firefly.administrations_page_create_sub_title');
-        $mainTitleIcon = 'fa-book';
+        $mainTitleIcon = 'bi-book';
         Log::debug(sprintf('Now at %s', __METHOD__));
 
         return view('administrations.create')->with(['title' => $title, 'subTitle' => $subTitle, 'mainTitleIcon' => $mainTitleIcon]);
diff --git a/app/Http/Controllers/UserGroup/EditController.php b/app/Http/Controllers/UserGroup/EditController.php
index 83a1527abe..983266b071 100644
--- a/app/Http/Controllers/UserGroup/EditController.php
+++ b/app/Http/Controllers/UserGroup/EditController.php
@@ -40,7 +40,7 @@ final class EditController extends Controller
     {
         $title         = (string) trans('firefly.administrations_page_title');
         $subTitle      = (string) trans('firefly.administrations_page_edit_sub_title', ['title' => $userGroup->title]);
-        $mainTitleIcon = 'fa-book';
+        $mainTitleIcon = 'bi-book';
         Log::debug(sprintf('Now at %s', __METHOD__));
 
         return view('administrations.edit', ['title' => $title, 'subTitle' => $subTitle, 'mainTitleIcon' => $mainTitleIcon]);
diff --git a/app/Http/Controllers/UserGroup/IndexController.php b/app/Http/Controllers/UserGroup/IndexController.php
index 57d17ff506..c25554ba67 100644
--- a/app/Http/Controllers/UserGroup/IndexController.php
+++ b/app/Http/Controllers/UserGroup/IndexController.php
@@ -41,7 +41,7 @@ final class IndexController extends Controller
     {
         $title         = (string) trans('firefly.administrations_page_title');
         $subTitle      = (string) trans('firefly.administrations_page_sub_title');
-        $mainTitleIcon = 'fa-book';
+        $mainTitleIcon = 'bi-book';
         Log::debug(sprintf('Now at %s', __METHOD__));
 
         return view('administrations.index')->with(['title' => $title, 'subTitle' => $subTitle, 'mainTitleIcon' => $mainTitleIcon]);
diff --git a/app/Http/Controllers/Webhooks/CreateController.php b/app/Http/Controllers/Webhooks/CreateController.php
index 38a4a04214..856668efd9 100644
--- a/app/Http/Controllers/Webhooks/CreateController.php
+++ b/app/Http/Controllers/Webhooks/CreateController.php
@@ -42,8 +42,8 @@ final class CreateController extends Controller
 
         // translations:
         $this->middleware(static function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-bolt');
-            app('view')->share('subTitleIcon', 'fa-plus');
+            app('view')->share('mainTitleIcon', 'bi-lightning');
+            app('view')->share('subTitleIcon', 'bi-plus');
             app('view')->share('title', (string) trans('firefly.webhooks'));
             app('view')->share('subTitle', (string) trans('firefly.create_new_webhook'));
 
diff --git a/app/Http/Controllers/Webhooks/DeleteController.php b/app/Http/Controllers/Webhooks/DeleteController.php
index 0e88533f5d..bccf62f81a 100644
--- a/app/Http/Controllers/Webhooks/DeleteController.php
+++ b/app/Http/Controllers/Webhooks/DeleteController.php
@@ -46,8 +46,8 @@ final class DeleteController extends Controller
 
         // translations:
         $this->middleware(static function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-bolt');
-            app('view')->share('subTitleIcon', 'fa-trash');
+            app('view')->share('mainTitleIcon', 'bi-lightning');
+            app('view')->share('subTitleIcon', 'bi-trash');
             app('view')->share('title', (string) trans('firefly.webhooks'));
             app('view')->share('subTitle', (string) trans('firefly.delete_webhook'));
 
diff --git a/app/Http/Controllers/Webhooks/EditController.php b/app/Http/Controllers/Webhooks/EditController.php
index ed5e13589d..45b6d694a8 100644
--- a/app/Http/Controllers/Webhooks/EditController.php
+++ b/app/Http/Controllers/Webhooks/EditController.php
@@ -46,7 +46,7 @@ final class EditController extends Controller
 
         // translations:
         $this->middleware(static function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-bolt');
+            app('view')->share('mainTitleIcon', 'bi-lightning');
             app('view')->share('subTitleIcon', 'bi-pencil');
             app('view')->share('title', (string) trans('firefly.webhooks'));
 
diff --git a/app/Http/Controllers/Webhooks/IndexController.php b/app/Http/Controllers/Webhooks/IndexController.php
index c897d4d017..2a1e68e152 100644
--- a/app/Http/Controllers/Webhooks/IndexController.php
+++ b/app/Http/Controllers/Webhooks/IndexController.php
@@ -42,7 +42,7 @@ final class IndexController extends Controller
 
         // translations:
         $this->middleware(static function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-bolt');
+            app('view')->share('mainTitleIcon', 'bi-lightning');
             app('view')->share('title', (string) trans('firefly.webhooks'));
 
             return $next($request);
diff --git a/app/Http/Controllers/Webhooks/ShowController.php b/app/Http/Controllers/Webhooks/ShowController.php
index d313d71b0f..74b991ec62 100644
--- a/app/Http/Controllers/Webhooks/ShowController.php
+++ b/app/Http/Controllers/Webhooks/ShowController.php
@@ -46,8 +46,8 @@ final class ShowController extends Controller
 
         // translations:
         $this->middleware(static function ($request, $next) {
-            app('view')->share('mainTitleIcon', 'fa-bolt');
-            app('view')->share('subTitleIcon', 'fa-bolt');
+            app('view')->share('mainTitleIcon', 'bi-lightning');
+            app('view')->share('subTitleIcon', 'bi-lightning');
             app('view')->share('title', (string) trans('firefly.webhooks'));
 
             return $next($request);
diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php
index 15cb1c4994..1eb64898d8 100644
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -357,7 +357,7 @@ class General extends AbstractExtension
                 'application/vnd.sun.xml.draw',
                 'application/vnd.sun.xml.draw.template',
                 'application/vnd.stardivision.draw',
-                'application/vnd.oasis.opendocument.chart'                 => 'fa-paint-brush',
+                'application/vnd.oasis.opendocument.chart'                 => 'bi-paint-bucket',
                 'application/vnd.oasis.opendocument.graphics',
                 'application/vnd.oasis.opendocument.graphics-template',
                 'application/vnd.sun.xml.math',