diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 3dadf77..030e554 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -7,7 +7,7 @@
         "name": "Accounting",
         "uri": null,
         "target": "self",
-        "icon": "fa fa-book",
+        "icon": "book",
         "order": 50,
         "from": "Accounting",
         "permission": { "permission": 2, "category": null, "element": null },
diff --git a/Theme/Backend/account-list.tpl.php b/Theme/Backend/account-list.tpl.php
index 082522a..f8e8aa1 100755
--- a/Theme/Backend/account-list.tpl.php
+++ b/Theme/Backend/account-list.tpl.php
@@ -1,7 +1,7 @@
 <template id="entry-list-tpl">
     <div id="entry-list" class="box" style="z-index: 99; position: relative; top: 20px; display: block; margin: 0 auto; width: 20%;">
         <table class="default sticky">
-            <caption><?= $this->getHtml('Accounts'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+            <caption><?= $this->getHtml('Accounts'); ?><i class="g-icon end-xs download btn">download</i></caption>
             <thead>
             <tr>
                 <td><?= $this->getHtml('ID', '0', '0'); ?>
diff --git a/Theme/Backend/coa-list.tpl.php b/Theme/Backend/coa-list.tpl.php
index ea972b4..1de2716 100644
--- a/Theme/Backend/coa-list.tpl.php
+++ b/Theme/Backend/coa-list.tpl.php
@@ -22,7 +22,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Chart of Accounts (COA)'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Chart of Accounts (COA)'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table class="default sticky">
                 <thead>
diff --git a/Theme/Backend/costcenter-list.tpl.php b/Theme/Backend/costcenter-list.tpl.php
index abf2802..4a83d1b 100755
--- a/Theme/Backend/costcenter-list.tpl.php
+++ b/Theme/Backend/costcenter-list.tpl.php
@@ -27,7 +27,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('CostCenters'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('CostCenters'); ?><i class="g-icon download btn end-xs">download</i></div>
             <table class="default sticky">
             <thead>
             <tr>
diff --git a/Theme/Backend/costobject-list.tpl.php b/Theme/Backend/costobject-list.tpl.php
index 678e1f6..68befef 100755
--- a/Theme/Backend/costobject-list.tpl.php
+++ b/Theme/Backend/costobject-list.tpl.php
@@ -27,7 +27,7 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('CostObjects'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('CostObjects'); ?><i class="g-icon download btn end-xs">download</i></div>
             <table class="default sticky">
             <thead>
             <tr>
diff --git a/Theme/Backend/entries.tpl.php b/Theme/Backend/entries.tpl.php
index b8e2781..aebfcef 100755
--- a/Theme/Backend/entries.tpl.php
+++ b/Theme/Backend/entries.tpl.php
@@ -34,11 +34,11 @@ $footerView->setResults(1);
                             <td><label for="iAccountStart"><?= $this->getHtml('CostObject'); ?>
                             <td><label for="iAccountStart"><?= $this->getHtml('EntryDate'); ?>
                         <tr>
-                            <td><span class="input"><button type="button" id="account-start" formaction="" data-action='[{"type": "popup", "tpl": "entry-list-tpl", "aniIn": "fadeIn", "aniOut": "fadeOut", "stay": 1000}]'><i class="fa fa-book"></i>
+                            <td><span class="input"><button type="button" id="account-start" formaction="" data-action='[{"type": "popup", "tpl": "entry-list-tpl", "aniIn": "fadeIn", "aniOut": "fadeOut", "stay": 1000}]'><i class="g-icon">book</i>
                                     </button><input type="number" id="iId" min="1" name="id" required></span>
-                            <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i>
+                            <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i>
                                     </button><input type="number" id="iId" min="1" name="id" required></span>
-                            <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i>
+                            <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i>
                                     </button><input type="number" id="iId" min="1" name="id" required></span>
                             <td><input type="datetime-local" id="iId" min="1" name="id" required>
                         <tr>
@@ -47,11 +47,11 @@ $footerView->setResults(1);
                             <td><label for="iAccountStart"><?= $this->getHtml('To'); ?>
                             <td><label for="iAccountStart"><?= $this->getHtml('To'); ?>
                         <tr>
-                            <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i>
+                            <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i>
                                     </button><input type="number" id="iId" min="1" name="id" required></span>
-                            <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i>
+                            <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i>
                                     </button><input type="number" id="iId" min="1" name="id" required></span>
-                            <td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i>
+                            <td><span class="input"><button type="button" formaction=""><i class="g-icon">book</i>
                                     </button><input type="number" id="iId" min="1" name="id" required></span>
                             <td><input type="datetime-local" id="iId" min="1" name="id" required>
                         <tr>
@@ -77,7 +77,7 @@ $footerView->setResults(1);
                     <div class="col-xs-12">
                         <section class="wf-100">
                             <table class="default">
-                                <caption><?= $this->getHtml('Entries'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                                <caption><?= $this->getHtml('Entries'); ?><i class="g-icon end-xs download btn">download</i></caption>
                                 <thead>
                                 <tr>
                                     <td><?= $this->getHtml('EntryDate'); ?>
@@ -112,7 +112,7 @@ $footerView->setResults(1);
                     <div class="col-xs-4">
                         <section class="wf-100">
                             <table class="default">
-                                <caption><?= $this->getHtml('Accounts'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                                <caption><?= $this->getHtml('Accounts'); ?><i class="g-icon end-xs download btn">download</i></caption>
                                 <thead>
                                 <tr>
                                     <td><?= $this->getHtml('Account'); ?>
@@ -132,7 +132,7 @@ $footerView->setResults(1);
                     <div class="col-xs-4">
                         <section class="wf-100">
                             <table class="table green">
-                                <caption><?= $this->getHtml('CostCenter'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                                <caption><?= $this->getHtml('CostCenter'); ?><i class="g-icon end-xs download btn">download</i></caption>
                                 <thead>
                                 <tr>
                                     <td><?= $this->getHtml('CostCenter'); ?>
@@ -152,7 +152,7 @@ $footerView->setResults(1);
                     <div class="col-xs-4">
                         <section class="wf-100">
                             <table class="table blue">
-                                <caption><?= $this->getHtml('CostObject'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                                <caption><?= $this->getHtml('CostObject'); ?><i class="g-icon end-xs download btn">download</i></caption>
                                 <thead>
                                 <tr>
                                     <td><?= $this->getHtml('Account'); ?>
diff --git a/Theme/Backend/journal-list.tpl.php b/Theme/Backend/journal-list.tpl.php
index 8b1534a..3dd6b05 100755
--- a/Theme/Backend/journal-list.tpl.php
+++ b/Theme/Backend/journal-list.tpl.php
@@ -27,7 +27,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="box w-100">
     <table class="default sticky">
-        <caption><?= $this->getHtml('Journal'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+        <caption><?= $this->getHtml('Journal'); ?><i class="g-icon end-xs download btn">download</i></caption>
         <thead>
         <tr>
             <td><?= $this->getHtml('ID', '0', '0'); ?>
diff --git a/Theme/Backend/stack-archive-list.tpl.php b/Theme/Backend/stack-archive-list.tpl.php
index 1789ce2..5f00d37 100755
--- a/Theme/Backend/stack-archive-list.tpl.php
+++ b/Theme/Backend/stack-archive-list.tpl.php
@@ -27,7 +27,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="box w-100">
     <table class="default sticky">
-        <caption><?= $this->getHtml('BatchPostings'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+        <caption><?= $this->getHtml('BatchPostings'); ?><i class="g-icon end-xs download btn">download</i></caption>
         <thead>
         <tr>
             <td><?= $this->getHtml('ID', '0', '0'); ?>
diff --git a/Theme/Backend/stack-list.tpl.php b/Theme/Backend/stack-list.tpl.php
index a8d6bb8..0488e5b 100755
--- a/Theme/Backend/stack-list.tpl.php
+++ b/Theme/Backend/stack-list.tpl.php
@@ -29,7 +29,7 @@ echo $this->data['nav']->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="default sticky">
-                <caption><?= $this->getHtml('BatchPostings'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                <caption><?= $this->getHtml('BatchPostings'); ?><i class="g-icon end-xs download btn">download</i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
diff --git a/Theme/Backend/stack-predefined-list.tpl.php b/Theme/Backend/stack-predefined-list.tpl.php
index a2b7158..3ba218d 100755
--- a/Theme/Backend/stack-predefined-list.tpl.php
+++ b/Theme/Backend/stack-predefined-list.tpl.php
@@ -27,7 +27,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="box w-100">
     <table class="default sticky">
-        <caption><?= $this->getHtml('BatchPostings'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+        <caption><?= $this->getHtml('BatchPostings'); ?><i class="g-icon end-xs download btn">download</i></caption>
         <thead>
         <tr>
             <td><?= $this->getHtml('ID', '0', '0'); ?>