diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index a19f709..6a77045 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -7,7 +7,7 @@
         "name": "Calendar",
         "uri": "{/base}/calendar/dashboard?{?}",
         "target": "self",
-        "icon": "fa fa-calendar",
+        "icon": "calendar_month",
         "order": 10,
         "from": "Calendar",
         "permission": { "permission": 2, "category": null, "element": null },
diff --git a/Theme/Backend/calendar-dashboard.tpl.php b/Theme/Backend/calendar-dashboard.tpl.php
index 8886c17..b3c70e1 100755
--- a/Theme/Backend/calendar-dashboard.tpl.php
+++ b/Theme/Backend/calendar-dashboard.tpl.php
@@ -18,8 +18,8 @@ $calendar = $this->data['calendar'];
     <div class="col-xs-12 col-md-9">
         <div class="box wf-100">
             <ul class="btns floatLeft">
-                <li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('calendar/dashboard?date=' . $calendar->date->createModify(0, -1, 0)->format('Y-m-d'))); ?>"><i class="fa fa-arrow-left"></i></a>
-                <li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('calendar/dashboard?date=' . $calendar->date->createModify(0, 1, 0)->format('Y-m-d'))); ?>"><i class="fa fa-arrow-right"></i></a>
+                <li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('calendar/dashboard?date=' . $calendar->date->createModify(0, -1, 0)->format('Y-m-d'))); ?>"><i class="g-icon">arrow_back</i></a>
+                <li><a href="<?= $this->printHtml(\phpOMS\Uri\UriFactory::build('calendar/dashboard?date=' . $calendar->date->createModify(0, 1, 0)->format('Y-m-d'))); ?>"><i class="g-icon">arrow_forward</i></a>
             </ul>
             <ul class="btns floatRight">
                 <li><a href=""><?= $this->getHtml('Day'); ?></a>
@@ -97,10 +97,10 @@ $calendar = $this->data['calendar'];
 
             <div class="inner">
                 <ul class="boxed">
-                    <li><i class="fa fa-times warning"></i> <span class="check"><input name="cal-0" type="checkbox" id="iDefault" checked><label for="iDefault">Default</label></span><i class="fa fa-cogs floatRight"></i>
+                    <li><i class="g-icon warning">close</i> <span class="check"><input name="cal-0" type="checkbox" id="iDefault" checked><label for="iDefault">Default</label></span><i class="g-icon floatRight">settings</i>
                 </ul>
                 <div class="spacer"></div>
-                <button><i class="fa fa-calendar-plus-o"></i> <?= $this->getHtml('Add', '0', '0'); ?></button> <button><i class="fa fa-calendar-check-o"></i> <?= $this->getHtml('Create', '0', '0'); ?></button>
+                <button><i class="g-icon">calendar_add_on</i> <?= $this->getHtml('Add', '0', '0'); ?></button> <button><i class="g-icon">event_available</i> <?= $this->getHtml('Create', '0', '0'); ?></button>
             </div>
         </section>
     </div>