diff --git a/bower.json b/bower.json
index 136f061..d651b65 100644
--- a/bower.json
+++ b/bower.json
@@ -22,6 +22,7 @@
     "admin-lte": "^2.4.3",
     "codemirror": "^5.36.0",
     "d3": "^5.1.0",
-    "bootbox.js": "bootbox#^4.4.0"
+    "bootbox.js": "bootbox#^4.4.0",
+    "components-font-awesome": "^5.0.6"
   }
 }
diff --git a/instancehandler/template/instance_list_ns.html b/instancehandler/template/instance_list_ns.html
index bc3b94a..7743043 100644
--- a/instancehandler/template/instance_list_ns.html
+++ b/instancehandler/template/instance_list_ns.html
@@ -67,7 +67,7 @@
                             <button type="button" class="btn btn-default"
                                     onclick="javascript:deleteNs('{% url 'projects:instances:delete' instance_id=i|get:'_id' project_id=project_id type=type %}')"
                                     data-toggle="tooltip" data-placement="top" data-container="body" title="Delete"><i
-                                    class="fa fa-trash-o"></i></button>
+                                    class="far fa-trash-alt"></i></button>
 
                             <button type="button" class="btn btn-default dropdown-toggle"
                                     data-toggle="dropdown" aria-expanded="false">Actions
@@ -82,7 +82,7 @@
                                 <li class="divider"></li>
                                 <li>
                                     <a href="javascript:deleteNs('{% url 'projects:instances:delete' instance_id=i|get:'_id' project_id=project_id type=type %}', true)">
-                                        <i class="fa fa-trash" style="color:red" ></i>Force delete</a></li>
+                                        <i class="far fa-trash-alt" style="color:red" ></i>Force delete</a></li>
                             </ul>
 
 
diff --git a/projecthandler/template/project/osm/descriptor/descriptorlist.html b/projecthandler/template/project/osm/descriptor/descriptorlist.html
index fee1b86..002cd57 100644
--- a/projecthandler/template/project/osm/descriptor/descriptorlist.html
+++ b/projecthandler/template/project/osm/descriptor/descriptorlist.html
@@ -61,7 +61,7 @@
                                 <button type="button" class="btn btn-default" data-container="body"
                                         data-toggle="tooltip" data-placement="top" title="Delete"
                                         onclick="javascript:deletePackage('{{ project_id }}', '{{ descriptor_type }}', '{{ k|get:"_id" }}')">
-                                    <i class="fa fa-trash-o"></i></button>
+                                    <i class="far fa-trash-alt"></i></button>
                             </div>
 
                         </td>
diff --git a/projecthandler/template/project/osm/osm_project_details.html b/projecthandler/template/project/osm/osm_project_details.html
index 9462902..ed3e0fa 100644
--- a/projecthandler/template/project/osm/osm_project_details.html
+++ b/projecthandler/template/project/osm/osm_project_details.html
@@ -61,7 +61,7 @@
                 <div class="small-box bg-maroon">
                     <div class="inner"><h3>{{ project_overview.ns }}</h3>
                         <p>NS Instances</p></div>
-                    <div class="icon"><i class="fa fa-list"></i></div>
+                    <div class="icon"><i class="fa fa-sitemap fa-fw"></i></div>
                     <a href='{% url "projects:instances:list" project_id=project_id type="ns"  %}' class="small-box-footer">Open list <i
                             class="fa fa-arrow-circle-right"></i></a></div>
             </div>
@@ -70,7 +70,7 @@
                 <div class="small-box bg-maroon">
                     <div class="inner"><h3>{{ project_overview.vnf }}</h3>
                         <p>VNF Instances</p></div>
-                    <div class="icon"><i class="fa fa-list"></i></div>
+                    <div class="icon"><i class="far fa-hdd fa-fw"></i></div>
                     <a href='{% url "projects:instances:list" project_id=project_id type="vnf"  %}' class="small-box-footer">Open list <i
                             class="fa fa-arrow-circle-right"></i></a></div>
             </div>
diff --git a/projecthandler/template/project/osm/osm_project_left_sidebar.html b/projecthandler/template/project/osm/osm_project_left_sidebar.html
index b265080..0655cfd 100644
--- a/projecthandler/template/project/osm/osm_project_left_sidebar.html
+++ b/projecthandler/template/project/osm/osm_project_left_sidebar.html
@@ -39,26 +39,26 @@
             {% url "projects:instances:list" project_id=project_id type='ns' as  instance_ns_list_url %}
             <li {% if request.get_full_path == instance_ns_list_url %} class="active" {% endif %} >
                 <a href='{% url "projects:instances:list" project_id=project_id  type="ns"%}'>
-                    <i class="fa fa-list fa-fw"></i><span>NS Instances</span>
+                    <i class="fa fa-sitemap fa-fw"></i><span>NS Instances</span>
                 </a>
             </li>
             {% url "projects:instances:list" project_id=project_id type='vnf' as  instance_ns_list_url %}
             <li {% if request.get_full_path == instance_ns_list_url %} class="active" {% endif %} >
                 <a href='{% url "projects:instances:list" project_id=project_id  type="vnf"%}'>
-                    <i class="fa fa-list fa-fw"></i><span>VNF Instances</span>
+                    <i class="far fa-hdd fa-fw"></i><span>VNF Instances</span>
                 </a>
             </li>
             {% url "projects:sdns:list"  project_id=project_id as sdn_list_url %}
              <li {% if request.get_full_path == sdn_list_url %} class="active" {% endif %}>
                  <a href='{% url "projects:sdns:list"  project_id=project_id %}'>
-                     <i class="fa fa-list fa-fw"></i><span>SDN Controllers</span>
+                     <i class="fas fa-globe fa-fw"></i><span>SDN Controllers</span>
                  </a>
              </li>
 
             {% url "projects:vims:list"  project_id=project_id as  vim_list_url %}
              <li {% if request.get_full_path == vim_list_url %} class="active" {% endif %}>
                  <a href='{% url "projects:vims:list"  project_id=project_id %}'>
-                     <i class="fa fa-list fa-fw"></i><span>VIM Accounts</span>
+                     <i class="fa fa-server fa-fw"></i><span>VIM Accounts</span>
                  </a>
              </li>
 
diff --git a/projecthandler/template/project/project_delete.html b/projecthandler/template/project/project_delete.html
index e6afc5e..432e1ff 100644
--- a/projecthandler/template/project/project_delete.html
+++ b/projecthandler/template/project/project_delete.html
@@ -38,7 +38,7 @@
                       <!-- /.box-body -->
                   </div>
                    <div class="box-footer">
-                          <button type="submit" class="btn btn-danger pull-right"><i class="fa fa-trash"></i> Delete</button>
+                          <button type="submit" class="btn btn-danger pull-right"><i class="far fa-trash-alt"></i> Delete</button>
                    </div>
               </form>
 
diff --git a/projecthandler/template/project/projectlist.html b/projecthandler/template/project/projectlist.html
index 5fd3b9d..033b0e0 100644
--- a/projecthandler/template/project/projectlist.html
+++ b/projecthandler/template/project/projectlist.html
@@ -47,7 +47,7 @@
 
 						<th>Owner</th>
 
-						<th><i class="fa fa-trash-o"></i></th>
+						<th><i class="far fa-trash-alt"></i></th>
 					</tr>
 				</thead>
 				<tbody>
diff --git a/sdnctrlhandler/template/sdn_list.html b/sdnctrlhandler/template/sdn_list.html
index 9b7386f..8abb5e0 100644
--- a/sdnctrlhandler/template/sdn_list.html
+++ b/sdnctrlhandler/template/sdn_list.html
@@ -65,7 +65,7 @@
                                                 class="fa fa-info"></i></button>
                                         <button type="button" class="btn btn-default"
                                                 onclick="javascript:deleteSDN('{{ project_id }}', '{{ s|get:"_id" }}')" data-toggle="tooltip" data-placement="top" data-container="body" title="Delete"><i
-                                                class="fa fa-trash-o" ></i></button>
+                                                class="far fa-trash-alt" ></i></button>
                                     </div>
                                 </td>
 
diff --git a/template/head.html b/template/head.html
index 44ae00c..39f42d9 100644
--- a/template/head.html
+++ b/template/head.html
@@ -7,8 +7,10 @@
   <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
   <!-- Bootstrap 3.3.7 -->
   <link rel="stylesheet" href="/static/bower_components/bootstrap/dist/css/bootstrap.min.css">
-  <!-- Font Awesome -->
-  <link rel="stylesheet" href="/static/bower_components/font-awesome/css/font-awesome.min.css">
+  <!-- Font Awesome-->
+  <link rel="stylesheet" href="/static/bower_components/font-awesome/css/font-awesome.css">
+  <!--<link rel="stylesheet" href="/static/bower_components/components-font-awesome/css/fontawesome.min.css">-->
+  <link rel="stylesheet" href="/static/bower_components/components-font-awesome/css/fontawesome-all.min.css">
   <!-- Ionicons -->
   <link rel="stylesheet" href="/static/bower_components/Ionicons/css/ionicons.min.css">
   <!-- Theme style -->
diff --git a/vimhandler/template/vim_list.html b/vimhandler/template/vim_list.html
index 753cb46..0729e00 100644
--- a/vimhandler/template/vim_list.html
+++ b/vimhandler/template/vim_list.html
@@ -68,7 +68,7 @@
                                                 class="fa fa-info"></i></button>
                                         <button type="button" class="btn btn-default"
                                                 onclick="javascript:deleteVim('{% url "projects:vims:delete"  project_id=project_id vim_id=p|get:"_id" %}')" data-toggle="tooltip" data-placement="top" data-container="body" title="Delete"><i
-                                                class="fa fa-trash-o" ></i></button>
+                                                class="far fa-trash-alt" ></i></button>
                                     </div>
                                 </td>