diff --git a/app/Http/Controllers/Budget/AvailableBudgetController.php b/app/Http/Controllers/Budget/AvailableBudgetController.php
index 9458546129..f48358b0be 100644
--- a/app/Http/Controllers/Budget/AvailableBudgetController.php
+++ b/app/Http/Controllers/Budget/AvailableBudgetController.php
@@ -59,7 +59,7 @@ class AvailableBudgetController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.budgets'));
-                app('view')->share('mainTitleIcon', 'fa-tasks');
+                app('view')->share('mainTitleIcon', 'fa-pie-chart');
                 $this->abRepository  = app(AvailableBudgetRepositoryInterface::class);
                 $this->currencyRepos = app(CurrencyRepositoryInterface::class);
 
diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php
index 5e528faf61..2fa75e527f 100644
--- a/app/Http/Controllers/Budget/BudgetLimitController.php
+++ b/app/Http/Controllers/Budget/BudgetLimitController.php
@@ -70,7 +70,7 @@ class BudgetLimitController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.budgets'));
-                app('view')->share('mainTitleIcon', 'fa-tasks');
+                app('view')->share('mainTitleIcon', 'fa-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 a802c30134..fd88ef52a9 100644
--- a/app/Http/Controllers/Budget/CreateController.php
+++ b/app/Http/Controllers/Budget/CreateController.php
@@ -58,7 +58,7 @@ class CreateController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.budgets'));
-                app('view')->share('mainTitleIcon', 'fa-tasks');
+                app('view')->share('mainTitleIcon', 'fa-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 442b856fa8..017719053b 100644
--- a/app/Http/Controllers/Budget/DeleteController.php
+++ b/app/Http/Controllers/Budget/DeleteController.php
@@ -54,7 +54,7 @@ class DeleteController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.budgets'));
-                app('view')->share('mainTitleIcon', 'fa-tasks');
+                app('view')->share('mainTitleIcon', 'fa-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 ea70b33be8..7dc7ce3495 100644
--- a/app/Http/Controllers/Budget/EditController.php
+++ b/app/Http/Controllers/Budget/EditController.php
@@ -59,7 +59,7 @@ class EditController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.budgets'));
-                app('view')->share('mainTitleIcon', 'fa-tasks');
+                app('view')->share('mainTitleIcon', 'fa-pie-chart');
                 $this->repository = app(BudgetRepositoryInterface::class);
                 $this->attachments = app(AttachmentHelperInterface::class);
 
diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php
index 2e2cd96ef5..c9b81fee8f 100644
--- a/app/Http/Controllers/Budget/IndexController.php
+++ b/app/Http/Controllers/Budget/IndexController.php
@@ -72,7 +72,7 @@ class IndexController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.budgets'));
-                app('view')->share('mainTitleIcon', 'fa-tasks');
+                app('view')->share('mainTitleIcon', 'fa-pie-chart');
                 $this->repository         = app(BudgetRepositoryInterface::class);
                 $this->opsRepository      = app(OperationsRepositoryInterface::class);
                 $this->abRepository       = app(AvailableBudgetRepositoryInterface::class);
diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php
index 3938a1d79b..60011147ff 100644
--- a/app/Http/Controllers/Budget/ShowController.php
+++ b/app/Http/Controllers/Budget/ShowController.php
@@ -64,7 +64,7 @@ class ShowController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.budgets'));
-                app('view')->share('mainTitleIcon', 'fa-tasks');
+                app('view')->share('mainTitleIcon', 'fa-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 7e019fc43f..fa19ddfcd1 100644
--- a/app/Http/Controllers/Category/CreateController.php
+++ b/app/Http/Controllers/Category/CreateController.php
@@ -57,7 +57,7 @@ class CreateController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.categories'));
-                app('view')->share('mainTitleIcon', 'fa-bar-chart');
+                app('view')->share('mainTitleIcon', 'fa-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 6856243e14..59a2a19ecc 100644
--- a/app/Http/Controllers/Category/DeleteController.php
+++ b/app/Http/Controllers/Category/DeleteController.php
@@ -53,7 +53,7 @@ class DeleteController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.categories'));
-                app('view')->share('mainTitleIcon', 'fa-bar-chart');
+                app('view')->share('mainTitleIcon', 'fa-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 632fa5a2ef..f5050899ce 100644
--- a/app/Http/Controllers/Category/EditController.php
+++ b/app/Http/Controllers/Category/EditController.php
@@ -59,7 +59,7 @@ class EditController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.categories'));
-                app('view')->share('mainTitleIcon', 'fa-bar-chart');
+                app('view')->share('mainTitleIcon', 'fa-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 063d9e6cec..633bf11cd0 100644
--- a/app/Http/Controllers/Category/IndexController.php
+++ b/app/Http/Controllers/Category/IndexController.php
@@ -53,7 +53,7 @@ class IndexController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.categories'));
-                app('view')->share('mainTitleIcon', 'fa-bar-chart');
+                app('view')->share('mainTitleIcon', 'fa-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 e4ff1bef55..8f7f5904f3 100644
--- a/app/Http/Controllers/Category/NoCategoryController.php
+++ b/app/Http/Controllers/Category/NoCategoryController.php
@@ -59,7 +59,7 @@ class NoCategoryController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.categories'));
-                app('view')->share('mainTitleIcon', 'fa-bar-chart');
+                app('view')->share('mainTitleIcon', 'fa-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 707fb39ffa..aa64ccdf36 100644
--- a/app/Http/Controllers/Category/ShowController.php
+++ b/app/Http/Controllers/Category/ShowController.php
@@ -58,7 +58,7 @@ class ShowController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.categories'));
-                app('view')->share('mainTitleIcon', 'fa-bar-chart');
+                app('view')->share('mainTitleIcon', 'fa-bookmark');
                 $this->repository = app(CategoryRepositoryInterface::class);
 
                 return $next($request);
@@ -84,7 +84,7 @@ class ShowController extends Controller
         $start = $start ?? session('start', Carbon::now()->startOfMonth());
         /** @var Carbon $end */
         $end          = $end ?? session('end', Carbon::now()->endOfMonth());
-        $subTitleIcon = 'fa-bar-chart';
+        $subTitleIcon = 'fa-bookmark';
         $page         = (int) $request->get('page');
         $attachments  = $this->repository->getAttachments($category);
         $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
@@ -122,7 +122,7 @@ class ShowController extends Controller
     public function showAll(Request $request, Category $category)
     {
         // default values:
-        $subTitleIcon = 'fa-bar-chart';
+        $subTitleIcon = 'fa-bookmark';
         $page         = (int) $request->get('page');
         $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
         $start        = null;
diff --git a/app/Http/Controllers/Json/BudgetController.php b/app/Http/Controllers/Json/BudgetController.php
index 30f3a1c38c..bcdf5e9376 100644
--- a/app/Http/Controllers/Json/BudgetController.php
+++ b/app/Http/Controllers/Json/BudgetController.php
@@ -63,7 +63,7 @@ class BudgetController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.budgets'));
-                app('view')->share('mainTitleIcon', 'fa-tasks');
+                app('view')->share('mainTitleIcon', 'fa-pie-chart');
                 $this->repository         = app(BudgetRepositoryInterface::class);
                 $this->opsRepository      = app(OperationsRepositoryInterface::class);
                 $this->abRepository       = app(AvailableBudgetRepositoryInterface::class);
diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index 5b0d2e455a..ff3a4d0738 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -71,7 +71,7 @@ class PiggyBankController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.piggyBanks'));
-                app('view')->share('mainTitleIcon', 'fa-sort-amount-asc');
+                app('view')->share('mainTitleIcon', 'fa-bullseye');
 
                 $this->attachments = app(AttachmentHelperInterface::class);
                 $this->piggyRepos    = app(PiggyBankRepositoryInterface::class);
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index a089138782..f9b0cf5304 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -64,7 +64,7 @@ class ReportController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.reports'));
-                app('view')->share('mainTitleIcon', 'fa-line-chart');
+                app('view')->share('mainTitleIcon', 'fa-bar-chart');
                 app('view')->share('subTitleIcon', 'fa-calendar');
                 $this->helper     = app(ReportHelperInterface::class);
                 $this->repository = app(BudgetRepositoryInterface::class);
diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index 4db114fea6..ffa4e50092 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -60,7 +60,7 @@ class TagController extends Controller
         $this->middleware(
             function ($request, $next) {
                 app('view')->share('title', (string) trans('firefly.tags'));
-                app('view')->share('mainTitleIcon', 'fa-tags');
+                app('view')->share('mainTitleIcon', 'fa-tag');
 
                 $this->attachments = app(AttachmentHelperInterface::class);
                 $this->repository = app(TagRepositoryInterface::class);
diff --git a/resources/views/v1/accounts/reconcile/transactions.twig b/resources/views/v1/accounts/reconcile/transactions.twig
index 4e98432b0a..73944ce267 100644
--- a/resources/views/v1/accounts/reconcile/transactions.twig
+++ b/resources/views/v1/accounts/reconcile/transactions.twig
@@ -8,8 +8,8 @@
         <th class="hidden-xs hidden-sm">{{ trans('list.date') }}</th>
         <th class="hidden-xs hidden-sm hidden-md">{{ trans('list.from') }}</th>
         <th class="hidden-xs hidden-sm hidden-md">{{ trans('list.to') }}</th>
-        <th class="hidden-xs"><i class="fa fa-tasks fa-fw" title="{{ trans('list.budget') }}"></i></th>
-        <th class="hidden-xs"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
+        <th class="hidden-xs"><i class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></i></th>
+        <th class="hidden-xs"><i class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></i></th>
     </tr>
     </thead>
     <tbody>
diff --git a/resources/views/v1/index.twig b/resources/views/v1/index.twig
index f9b51ec6fa..480041b5da 100644
--- a/resources/views/v1/index.twig
+++ b/resources/views/v1/index.twig
@@ -30,8 +30,10 @@
                     <canvas id="budgets-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
                 <div class="box-footer">
-                    <a href="{{ route('budgets.index') }}" class="btn btn-default button-sm"><i
-                                class="fa fa-tasks"></i> {{ 'go_to_budgets'|_ }}</a>
+                    <a href="{{ route('budgets.index') }}" class="btn btn-default button-sm">
+                        <i class="fa fa-pie-chart"></i>
+                        <span>{{ 'go_to_budgets'|_ }}</span>
+                    </a>
                 </div>
             </div>
             {# CATEGORIES #}
@@ -44,8 +46,10 @@
                     <canvas id="categories-chart" style="width:100%;height:400px;" height="400" width="100%"></canvas>
                 </div>
                 <div class="box-footer">
-                    <a href="{{ route('categories.index') }}" class="btn btn-default button-sm"><i
-                                class="fa fa-bar-chart"></i> {{ 'go_to_categories'|_ }}</a>
+                    <a href="{{ route('categories.index') }}" class="btn btn-default button-sm">
+                        <i class="fa fa-bookmark"></i>
+                        <span>{{ 'go_to_categories'|_ }}</span>
+                    </a>
                 </div>
             </div>
         </div>
diff --git a/resources/views/v1/partials/control-bar.twig b/resources/views/v1/partials/control-bar.twig
index 40d25cbbe4..ae6cca0c5c 100644
--- a/resources/views/v1/partials/control-bar.twig
+++ b/resources/views/v1/partials/control-bar.twig
@@ -69,7 +69,7 @@
 
                 <li>
                     <a href="{{ route('budgets.create') }}">
-                        <i class="menu-icon fa fa-tasks bg-red"></i>
+                        <i class="menu-icon fa fa-pie-chart bg-red"></i>
 
                         <div class="menu-info">
                             <h4 class="control-sidebar-subheading">{{ 'new_budget'|_ }}</h4>
@@ -79,7 +79,7 @@
 
                 <li>
                     <a href="{{ route('categories.create') }}">
-                        <i class="menu-icon fa fa-bar-chart bg-red"></i>
+                        <i class="menu-icon fa fa-bookmark bg-red"></i>
 
                         <div class="menu-info">
                             <h4 class="control-sidebar-subheading">{{ 'new_category'|_ }}</h4>
@@ -89,7 +89,7 @@
 
                 <li>
                     <a href="{{ route('piggy-banks.create') }}">
-                        <i class="menu-icon fa fa-sort-amount-asc bg-teal"></i>
+                        <i class="menu-icon fa fa-bullseye bg-teal"></i>
 
                         <div class="menu-info">
                             <h4 class="control-sidebar-subheading">{{ 'new_piggy_bank'|_ }}</h4>
diff --git a/resources/views/v1/popup/list/journals.twig b/resources/views/v1/popup/list/journals.twig
index 14dbcb9d0a..50d557a7ab 100644
--- a/resources/views/v1/popup/list/journals.twig
+++ b/resources/views/v1/popup/list/journals.twig
@@ -11,14 +11,19 @@
         {% if not hideDestination %}
             <th class="hidden-xs">{{ trans('list.to') }}</th>
         {% endif %}
+
         {# Hide budgets? #}
         {% if not hideBudget %}
-            <th class="hidden-xs"><i class="fa fa-tasks fa-fw" title="{{ trans('list.budget') }}"></i></th>
+            <th class="hidden-xs">
+                <i class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></i>
+            </th>
         {% endif %}
 
         {# Hide categories? #}
         {% if not hideCategory %}
-            <th class="hidden-xs"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
+            <th class="hidden-xs">
+                <i class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></i>
+            </th>
         {% endif %}
     </tr>
     </thead>
diff --git a/resources/views/v1/reports/partials/journals-audit.twig b/resources/views/v1/reports/partials/journals-audit.twig
index 3272acc386..d2838af694 100644
--- a/resources/views/v1/reports/partials/journals-audit.twig
+++ b/resources/views/v1/reports/partials/journals-audit.twig
@@ -14,8 +14,8 @@
         <th class="hide-from">{{ trans('list.from') }}</th>
         <th class="hide-to">{{ trans('list.to') }}</th>
 
-        <th class="hide-budget"><i class="fa fa-tasks fa-fw" title="{{ trans('list.budget') }}"></i></th>
-        <th class="hide-category"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
+        <th class="hide-budget"><i class="fa fa-pie-chart fa-fw" title="{{ trans('list.budget') }}"></i></th>
+        <th class="hide-category"><i class="fa fa-bookmark fa-fw" title="{{ trans('list.category') }}"></i></th>
         <th class="hide-bill">{{ trans('list.bill') }}</th>
 
         {# more optional fields (2x) #}