diff --git a/Admin/Install/Application/Timerecording/login.tpl.php b/Admin/Install/Application/Timerecording/login.tpl.php
index 6052fb7..71baff3 100644
--- a/Admin/Install/Application/Timerecording/login.tpl.php
+++ b/Admin/Install/Application/Timerecording/login.tpl.php
@@ -247,15 +247,15 @@ $head = $this->head;
             <h1><?= $this->getHtml('Login', '0', '0'); ?>:</h1>
                 <label for="iName"><?= $this->getHtml('Username', '0', '0'); ?>:</label>
                 <div class="inputWithIcon">
-                    <i class="frontIcon fa fa-user fa-lg fa-fw" aria-hidden="true"></i>
+                    <i class="frontIcon g-icon" aria-hidden="true">person</i>
                     <input id="iName" type="text" name="user" tabindex="3" value="admin" autofocus>
-                    <i class="endIcon fa fa-times close fa-lg fa-fw" aria-hidden="true"></i>
+                    <i class="endIcon g-icon close" aria-hidden="true">close</i>
                 </div>
                 <label for="iPassword"><?= $this->getHtml('Password', '0', '0'); ?>:</label>
                 <div class="inputWithIcon">
-                    <i class="frontIcon fa fa-lock fa-lg fa-fw" aria-hidden="true"></i>
+                    <i class="frontIcon g-icon" aria-hidden="true">lock</i>
                     <input id="iPassword" type="password" name="pass" tabindex="4" value="orange">
-                    <i class="endIcon fa fa-times close fa-lg fa-fw" aria-hidden="true"></i>
+                    <i class="endIcon g-icon close" aria-hidden="true">close</i>
                 </div>
                 <input id="iLoginButton" name="loginButton" type="submit" value="<?= $this->getHtml('Login', '0', '0'); ?>" tabindex="5">
                 <button class="cancelButton" name="cancelButton" type="button" tabindex="6"><?= $this->getHtml('Cancel', '0', '0'); ?></button>
diff --git a/Theme/Backend/dashboard.tpl.php b/Theme/Backend/dashboard.tpl.php
index 846a65c..75f5159 100755
--- a/Theme/Backend/dashboard.tpl.php
+++ b/Theme/Backend/dashboard.tpl.php
@@ -20,7 +20,7 @@ echo $this->data['nav']->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
         <table id="accountList" class="default">
-                <caption><?= $this->getHtml('Recordings'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                <caption><?= $this->getHtml('Recordings'); ?><i class="g-icon end-xs download btn">download</i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('Date'); ?>
diff --git a/Theme/Backend/private-dashboard.tpl.php b/Theme/Backend/private-dashboard.tpl.php
index 965c856..7cccdc8 100755
--- a/Theme/Backend/private-dashboard.tpl.php
+++ b/Theme/Backend/private-dashboard.tpl.php
@@ -112,93 +112,93 @@ echo $this->data['nav']->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <section class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Recordings'); ?><i class="lni lni-download download btn end-xs"></i></div>
+            <div class="portlet-head"><?= $this->getHtml('Recordings'); ?><i class="g-icon download btn end-xs">download</i></div>
             <table id="recordingList" class="default">
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('Date'); ?>
                         <label for="recordingList-sort-1">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-1">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="recordingList-sort-2">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-2">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Type'); ?>
                         <label for="recordingList-sort-3">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-3">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="recordingList-sort-4">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-4">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Status'); ?>
                         <label for="recordingList-sort-5">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-5">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="recordingList-sort-6">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-6">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Start'); ?>
                         <label for="recordingList-sort-7">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-7">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="recordingList-sort-8">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-8">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Break'); ?>
                         <label for="recordingList-sort-9">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-9">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="recordingList-sort-10">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-10">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('End'); ?>
                         <label for="recordingList-sort-11">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-11">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="recordingList-sort-12">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-12">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                     <td><?= $this->getHtml('Total'); ?>
                         <label for="recordingList-sort-13">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-13">
-                            <i class="sort-asc fa fa-chevron-up"></i>
+                            <i class="sort-asc g-icon">expand_less</i>
                         </label>
                         <label for="recordingList-sort-14">
                             <input type="radio" name="recordingList-sort" id="recordingList-sort-14">
-                            <i class="sort-desc fa fa-chevron-down"></i>
+                            <i class="sort-desc g-icon">expand_more</i>
                         </label>
                         <label>
-                            <i class="filter fa fa-filter"></i>
+                            <i class="filter g-icon">filter_alt</i>
                         </label>
                 <tbody>
                 <?php
diff --git a/Theme/Backend/private-session.tpl.php b/Theme/Backend/private-session.tpl.php
index fb9f8fb..8fdb4b9 100755
--- a/Theme/Backend/private-session.tpl.php
+++ b/Theme/Backend/private-session.tpl.php
@@ -22,7 +22,7 @@ echo $this->data['nav']->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
         <table id="accountList" class="default">
-                <caption><?= $session->start->format('Y-m-d'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                <caption><?= $session->start->format('Y-m-d'); ?><i class="g-icon end-xs download btn">download</i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('Status'); ?>
diff --git a/Theme/Timeterminal/overview.tpl.php b/Theme/Timeterminal/overview.tpl.php
index c0a910b..548b24b 100755
--- a/Theme/Timeterminal/overview.tpl.php
+++ b/Theme/Timeterminal/overview.tpl.php
@@ -82,7 +82,7 @@ echo $this->data['nav']->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
         <table id="accountList" class="default">
-                <caption><?= $this->getHtml('Recordings'); ?><i class="fa fa-download end-xs download btn"></i></caption>
+                <caption><?= $this->getHtml('Recordings'); ?><i class="g-icon end-xs download btn">download</i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('Date'); ?>