diff --git a/resources/install/resources/sass/app.scss.stub b/resources/install/resources/sass/app.scss.stub
index abaa9d8..d759a59 100644
--- a/resources/install/resources/sass/app.scss.stub
+++ b/resources/install/resources/sass/app.scss.stub
@@ -1,7 +1,10 @@
+// Fonts
+@import url('https://fonts.bunny.net/css?family=Nunito');
 @import 'variables';
 
 @import '~bootstrap/scss/bootstrap';
 
-@import '~@fortawesome/fontawesome-free/css/all.css';
+// Bootstrap Icons
+@import 'bootstrap-icons/font/bootstrap-icons.css';
 
 @import '../css/app.css';
\ No newline at end of file
diff --git a/resources/install/resources/views/home.blade.php.stub b/resources/install/resources/views/home.blade.php.stub
index 89dc62a..9dea863 100644
--- a/resources/install/resources/views/home.blade.php.stub
+++ b/resources/install/resources/views/home.blade.php.stub
@@ -5,7 +5,7 @@
 <div class="row justify-content-center">
 	<div class="col-md-12">
 		<div class="card">
-			<div class="card-header"><h5><span class="text-center fa fa-home"></span> @yield('title')</h5></div>
+			<div class="card-header"><h5><span class="text-center bi-house-fill"></span> @yield('title')</h5></div>
 			<div class="card-body">
 				<h5>Hi <strong>{{ Auth::user()->name }},</strong> {{ __('You are logged in to ') }}{{ config('app.name', 'Laravel') }}</h5>
 				</br> 
@@ -14,28 +14,28 @@
 			<div class="row w-100">
 					<div class="col-md-3">
 						<div class="card border-info mx-sm-1 p-3">
-							<div class="card border-info text-info p-3" ><span class="text-center fa fa-plane-departure" aria-hidden="true"></span></div>
+							<div class="card border-info text-info p-3" ><span class="text-center bi-airplane" aria-hidden="true"></span></div>
 							<div class="text-info text-center mt-3"><h4>Flights</h4></div>
 							<div class="text-info text-center mt-2"><h1>234</h1></div>
 						</div>
 					</div>
 					<div class="col-md-3">
 						<div class="card border-success mx-sm-1 p-3">
-							<div class="card border-success text-success p-3 my-card"><span class="text-center fa fa-luggage-cart" aria-hidden="true"></span></div>
+							<div class="card border-success text-success p-3 my-card"><span class="text-center bi-luggage-fill" aria-hidden="true"></span></div>
 							<div class="text-success text-center mt-3"><h4>Baggage</h4></div>
 							<div class="text-success text-center mt-2"><h1>9,332</h1></div>
 						</div>
 					</div>
 					<div class="col-md-3">
 						<div class="card border-danger mx-sm-1 p-3">
-							<div class="card border-danger text-danger p-3 my-card" ><span class="text-center fa fa-person-booth" aria-hidden="true"></span></div>
+							<div class="card border-danger text-danger p-3 my-card" ><span class="text-center bi-person-walking" aria-hidden="true"></span></div>
 							<div class="text-danger text-center mt-3"><h4>Passengers</h4></div>
 							<div class="text-danger text-center mt-2"><h1>12,762</h1></div>
 						</div>
 					</div>
 					<div class="col-md-3">
 						<div class="card border-warning mx-sm-1 p-3">
-							<div class="card border-warning text-warning p-3 my-card" ><span class="text-center fa fa-users" aria-hidden="true"></span></div>
+							<div class="card border-warning text-warning p-3 my-card" ><span class="text-center bi-people-fill" aria-hidden="true"></span></div>
 							<div class="text-warning text-center mt-3"><h4>Users</h4></div>
 							<div class="text-warning text-center mt-2"><h1>{{ Auth::user()->count() }}</h1></div>
 						</div>
diff --git a/resources/install/resources/views/welcome.blade.php.stub b/resources/install/resources/views/welcome.blade.php.stub
index c356219..940ac00 100644
--- a/resources/install/resources/views/welcome.blade.php.stub
+++ b/resources/install/resources/views/welcome.blade.php.stub
@@ -5,7 +5,7 @@
 <div class="row justify-content-center">
     <div class="col-md-12">
         <div class="card">
-            <div class="card-header"><h5><span class="text-center fa fa-home"></span> @yield('title')</h5></div>
+            <div class="card-header"><h5><span class="text-center bi-house-fill"></span> @yield('title')</h5></div>
             <div class="card-body">
               <h5>  
             @guest
diff --git a/src/Commands/LivewireCrudGenerator.php b/src/Commands/LivewireCrudGenerator.php
index 8b8c4f9..943bd11 100644
--- a/src/Commands/LivewireCrudGenerator.php
+++ b/src/Commands/LivewireCrudGenerator.php
@@ -60,7 +60,7 @@ public function handle()
         $layoutFile = 'resources/views/layouts/app.blade.php';
         $layoutContents = $this->filesystem->get($layoutFile);
         $navItemStub = "\t\t\t\t\t\t<li class=\"nav-item\">
-                            <a href=\"{{ url('/".$this->getNameInput()."') }}\" class=\"nav-link\"><i class=\"fab fa-laravel text-info\"></i> ". ucfirst($this->getNameInput()) ."</a> 
+                            <a href=\"{{ url('/".$this->getNameInput()."') }}\" class=\"nav-link\"><i class=\"bi-house-fill text-info\"></i> ". ucfirst($this->getNameInput()) ."</a> 
                         </li>";
         $navItemHook = '<!--Nav Bar Hooks - Do not delete!!-->';
 
diff --git a/src/stubs/views/view.stub b/src/stubs/views/view.stub
index 1d4886d..e6dfaff 100644
--- a/src/stubs/views/view.stub
+++ b/src/stubs/views/view.stub
@@ -6,7 +6,7 @@
 				<div class="card-header">
 					<div style="display: flex; justify-content: space-between; align-items: center;">
 						<div class="float-left">
-							<h4><i class="fab fa-laravel text-info"></i>
+							<h4><i class="bi-house-fill text-info"></i>
 							{{modelTitle}} Listing </h4>
 						</div>
 						<div wire:poll.60s>
@@ -19,7 +19,7 @@
 							<input wire:model='keyWord' type="text" class="form-control" name="search" id="search" placeholder="Search {{modelTitle}}s">
 						</div>
 						<div class="btn btn-sm btn-info" data-toggle="modal" data-target="#createDataModal">
-						<i class="fa fa-plus"></i>  Add {{modelTitle}}s
+						<i class="bi-plus-lg"></i>  Add {{modelTitle}}s
 						</div>
 					</div>
 				</div>
@@ -43,8 +43,8 @@
 									Actions
 									</button>
 									<div class="dropdown-menu dropdown-menu-right">
-									<a data-toggle="modal" data-target="#updateModal" class="dropdown-item" wire:click="edit({{$row->id}})"><i class="fa fa-edit"></i> Edit </a>							 
-									<a class="dropdown-item" onclick="confirm('Confirm Delete {{modelTitle}} id {{$row->id}}? \nDeleted {{modelTitle}}s cannot be recovered!')||event.stopImmediatePropagation()" wire:click="destroy({{$row->id}})"><i class="fa fa-trash"></i> Delete </a>   
+									<a data-toggle="modal" data-target="#updateModal" class="dropdown-item" wire:click="edit({{$row->id}})"><i class="bi-pencil-fill"></i> Edit </a>							 
+									<a class="dropdown-item" onclick="confirm('Confirm Delete {{modelTitle}} id {{$row->id}}? \nDeleted {{modelTitle}}s cannot be recovered!')||event.stopImmediatePropagation()" wire:click="destroy({{$row->id}})"><i class="bi-trash3-fill"></i> Delete </a>   
 									</div>
 								</div>
 								</td>