diff --git a/views/customer.hbs b/views/customer.hbs
index 64cddc8..1789e47 100644
--- a/views/customer.hbs
+++ b/views/customer.hbs
@@ -5,8 +5,8 @@
             <div class="col-sm-10">
                 <div class="page-header">
                     <div class="btn-group float-right" role="group" aria-label="Basic example">
-                        <button class="btn btn-outline-success" id="updateCustomer">Save customer <i class="fa fa-floppy-o"></i></button>
-                        <button id="deleteCustomer" onclick="return confirm('Are you sure you want to delete this customer?');" class="btn btn-outline-info">Delete customer <i class="fa fa-trash"></i></button>
+                        <button class="btn btn-outline-success" id="updateCustomer">Save customer <i class="fas fa-save"></i></button>
+                        <button id="deleteCustomer" onclick="return confirm('Are you sure you want to delete this customer?');" class="btn btn-outline-info">Delete customer <i class="far fa-trash-alt"></i></button>
                     </div>
                     <h2>Customer</h2>
                 </div>
diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs
index 0d81cb2..e1b0458 100644
--- a/views/layouts/layout.hbs
+++ b/views/layouts/layout.hbs
@@ -118,7 +118,7 @@
                     {{/unless}}
                     {{#if admin}}
                     {{#if @root.session.user}}
-                        <li class="nav-item"><a href="/admin/logout"><i class="fa fa-sign-out" aria-hidden="true"> </i>Logout</a></li>
+                        <li class="nav-item"><a href="/admin/logout"><i class="fas fa-sign-out-alt"></i> Logout</a></li>
                     {{/if}}
                     {{/if}}
                 </ul>
diff --git a/views/orders.hbs b/views/orders.hbs
index 6cfcb1b..51db6e8 100644
--- a/views/orders.hbs
+++ b/views/orders.hbs
@@ -46,7 +46,7 @@
                 <li class="list-group-item">
                     <div class="float-right top-pad-5">
                         {{ @root.__ "Status" }}: <span class="text-{{getStatusColor this.orderStatus}}">{{this.orderStatus}}</span>
-                        <a class="text-danger" href="/admin/order/delete/{{this._id}}" onclick="return confirm('Are you sure you want to delete this order?');"> <i class="fa fa-trash-o"></i></a>
+                        <a class="text-danger" href="/admin/order/delete/{{this._id}}" onclick="return confirm('Are you sure you want to delete this order?');"> <i class="far fa-trash-alt"></i></a>
                     </div>
                     <div class="top-pad-5">
                         <a href="/admin/order/view/{{this._id}}" class="text-success">View order</a> - <span class="text-info">Date: </span>{{formatDate this.orderDate "DD/MM/YYYY hh:mm"}} | <span class="text-info">Email:</span> {{this.orderEmail}} | <span class="text-info">{{ @root.__ "Last name" }}:</span> {{this.orderLastname}}
diff --git a/views/product-edit.hbs b/views/product-edit.hbs
index 1afa23d..657a1e4 100644
--- a/views/product-edit.hbs
+++ b/views/product-edit.hbs
@@ -5,7 +5,7 @@
                 <div class="page-header">
                     <div class="float-right">
                         <button type="button" class="btn btn-outline-info" data-toggle="modal" data-target="#myModal">{{ @root.__ "Upload image" }}</button>
-                        <button id="productUpdate" class="btn btn-outline-success">{{ @root.__ "Save product" }} <i class="fa fa-floppy-o"></i></button>
+                        <button id="productUpdate" class="btn btn-outline-success">{{ @root.__ "Save product" }} <i class="far fa-save"></i></button>
                     </div>
                     <h2>{{ @root.__ "Edit product" }}</h2>
                 </div>
diff --git a/views/product-new.hbs b/views/product-new.hbs
index 523d274..245ff47 100644
--- a/views/product-new.hbs
+++ b/views/product-new.hbs
@@ -3,7 +3,7 @@
         <div class="col-sm-12">
             <div class="page-header">
                 <div class="float-right">
-                    <button id="frm_edit_product_save" class="btn btn-outline-success" type="submit">Add product <i class="fa fa-plus"></i></button>
+                    <button id="frm_edit_product_save" class="btn btn-outline-success" type="submit">Add product <i class="far fa-plus-square"></i></button>
                 </div>
                 <h2>{{ @root.__ "New product" }}</h2>
             </div>
diff --git a/views/products.hbs b/views/products.hbs
index 61e1097..940fedf 100644
--- a/views/products.hbs
+++ b/views/products.hbs
@@ -25,7 +25,7 @@
             </li>
             {{#each results}}
                 <li class="list-group-item">
-                    <button class="float-right btn text-danger btn-delete-product" data-id="{{this._id}}"> <i class="fa fa-trash-o"></i></button>
+                    <button class="float-right btn text-danger btn-delete-product" data-id="{{this._id}}"> <i class="far fa-trash-alt"></i></button>
                     <h4 class="float-right"><input id="{{this._id}}" class="published_state" type="checkbox" {{checkedState this.productPublished}}></h4>
                     <div class="top-pad-8"><a href="/admin/product/edit/{{this._id}}">{{this.productTitle}}</a></div>
                 </li>
diff --git a/views/settings-menu.hbs b/views/settings-menu.hbs
index 98ddd1f..6babdd2 100644
--- a/views/settings-menu.hbs
+++ b/views/settings-menu.hbs
@@ -12,7 +12,7 @@
                     {{#each menu.items}}
                         <div class="row drag-row" id="menuId-{{@key}}">
                             <input type="hidden" class="navId" value="{{title}}">
-                            <div class="col-sm-1 dragable_item"><i class="fa fa-arrows"></i></div>
+                            <div class="col-sm-1 dragable_item"><i class="fas fa-arrows-alt"></i></div>
                             <div class="col-sm-2 dragable_item">
                                 <input type="text" class="form-control navMenu navItem" value="{{title}}">
                             </div>
@@ -21,10 +21,10 @@
                             </div>
                             <div class="col-sm-3 dragable_item">
                                 <a class="btn btn-outline-danger settings-menu-delete" data-id="{{@key}}">
-                                    <i class="fa fa-trash-o"></i>
+                                    <i class="far fa-trash-alt"></i>
                                 </a>
                                 <button type="submit" class="btn btn-outline-success" id="settings-menu-update" data-id="{{@key}}">
-                                    <i class="fa fa-floppy-o"></i>
+                                    <i class="far fa-save"></i>
                                 </button>
                             </div>
                         </div>
@@ -39,7 +39,7 @@
                     </div>
                     <div class="col-sm-3">
                         <button type="submit" id="settings-menu-new" class="btn btn-outline-success">
-                            <i class="fa fa-plus"></i>
+                            <i class="fas fa-plus"></i>
                         </button>
                     </div>
                 </div>
diff --git a/views/themes/Cloth/cart.hbs b/views/themes/Cloth/cart.hbs
index 9506202..a3df6f5 100644
--- a/views/themes/Cloth/cart.hbs
+++ b/views/themes/Cloth/cart.hbs
@@ -38,7 +38,7 @@
                             </div>
                         </div>
                         <div class="col-md-4 text-right">
-                            <button class="btn btn-outline-danger btn-delete-from-cart" data-id="{{../this.productId}}" type="button"><i class="fa fa-trash" data-id="{{../this.productId}}" aria-hidden="true"></i></button>
+                            <button class="btn btn-outline-danger btn-delete-from-cart" data-id="{{../this.productId}}" type="button"><i class="far fa-trash-alt" data-id="{{../this.productId}}" aria-hidden="true"></i></button>
                         </div>
                         {{/ifCond}}
                     </div>