diff --git a/admin/template/menus.php b/admin/template/menus.php
index e2075d58..5f8c1f10 100644
--- a/admin/template/menus.php
+++ b/admin/template/menus.php
@@ -4,23 +4,23 @@ $menus = [
 	['name' => 'Dashboard', 'icon' => 'tachometer-alt', 'order' => 10, 'link' => 'dashboard'],
 	['name' => 'News', 'icon' => 'newspaper', 'order' => 20, 'link' =>
 		[
-			['name' => 'View', 'link' => 'news', 'order' => 10],
-			['name' => 'Add news', 'link' => 'news&action=new&type=1', 'order' => 20],
-			['name' => 'Add ticker', 'link' => 'news&action=new&type=2', 'order' => 30],
-			['name' => 'Add article', 'link' => 'news&action=new&type=3', 'order' => 40],
+			['name' => 'View', 'link' => 'news', 'icon' => 'list', 'order' => 10],
+			['name' => 'Add news', 'link' => 'news&action=new&type=1', 'icon' => 'plus', 'order' => 20],
+			['name' => 'Add ticker', 'link' => 'news&action=new&type=2', 'icon' => 'plus', 'order' => 30],
+			['name' => 'Add article', 'link' => 'news&action=new&type=3', 'icon' => 'plus', 'order' => 40],
 		],
 	],
 	['name' => 'Changelogs', 'icon' => 'newspaper', 'order' => 30, 'link' =>
 		[
-			['name' => 'View', 'link' => 'changelog', 'order' => 10],
-			['name' => 'Add', 'link' => 'changelog&action=new', 'order' => 20],
+			['name' => 'View', 'link' => 'changelog', 'icon' => 'list', 'order' => 10],
+			['name' => 'Add', 'link' => 'changelog&action=new', 'icon' => 'plus', 'order' => 20],
 		],
 	],
 	['name' => 'Mailer', 'icon' => 'envelope', 'order' => 40, 'link' => 'mailer', 'disabled' => !config('mail_enabled')],
 	['name' => 'Pages', 'icon' => 'book', 'order' => 50, 'link' =>
 		[
-			['name' => 'View', 'link' => 'pages', 'order' => 10],
-			['name' => 'Add', 'link' => 'pages&action=new', 'order' => 20],
+			['name' => 'View', 'link' => 'pages', 'icon' => 'list', 'order' => 10],
+			['name' => 'Add', 'link' => 'pages&action=new', 'icon' => 'plus', 'order' => 20],
 		],
 	],
 	['name' => 'Menus', 'icon' => 'list', 'order' => 60, 'link' => 'menus'],
@@ -28,23 +28,23 @@ $menus = [
 	['name' => 'Server Data', 'icon' => 'gavel', 'order' => 80, 'link' => 'data'],
 	['name' => 'Editor', 'icon' => 'edit', 'order' => 90, 'link' =>
 		[
-			['name' => 'Accounts', 'link' => 'accounts', 'order' => 10],
-			['name' => 'Players', 'link' => 'players', 'order' => 20],
+			['name' => 'Accounts', 'link' => 'accounts', 'icon' => 'users', 'order' => 10],
+			['name' => 'Players', 'link' => 'players', 'icon' => 'user-astronaut', 'order' => 20],
 		],
 	],
 	['name' => 'Tools', 'icon' => 'tools', 'order' => 100, 'link' =>
 		[
 			['name' => 'Mass Account Actions', 'link' => 'tools&tool=account', 'order' => 10],
 			['name' => 'Mass Teleport Actions', 'link' => 'tools&tool=teleport', 'order' => 20],
-			['name' => 'Notepad', 'link' => 'notepad', 'order' => 30],
-			['name' => 'phpinfo', 'link' => 'phpinfo', 'order' => 40],
+			['name' => 'Notepad', 'link' => 'notepad', 'icon' => 'marker', 'order' => 30],
+			['name' => 'phpinfo', 'link' => 'phpinfo', 'icon' => 'server', 'order' => 40],
 		],
 	],
 	['name' => 'Logs', 'icon' => 'bug', 'order' => 110, 'link' =>
 		[
-			['name' => 'Logs', 'link' => 'logs', 'order' => 10],
-			['name' => 'Reports', 'link' => 'reports', 'order' => 20],
-			['name' => 'Visitors', 'icon' => 'user', 'link' => 'visitors', 'order' => 30],
+			['name' => 'Logs', 'link' => 'logs', 'icon' => 'book', 'order' => 10],
+			['name' => 'Reports', 'link' => 'reports', 'icon' => 'book', 'order' => 20],
+			['name' => 'Visitors', 'link' => 'visitors', 'icon' => 'user', 'order' => 30],
 		],
 	],
 ];
diff --git a/admin/template/template.php b/admin/template/template.php
index 407fd8ac..7602e9c3 100644
--- a/admin/template/template.php
+++ b/admin/template/template.php
@@ -79,12 +79,12 @@
 										$nav_construct .= ' active';
 										$used_menu = true;
 									}
-									$nav_construct .= '"><i class="far fa-' . (isset($sub_menu['icon']) ? $sub_menu['icon'] : 'circle') . ' nav-icon"></i><p>' . $sub_menu['name'] . '</p></a></li>';
+									$nav_construct .= '"><i class="fas fa-' . ($sub_menu['icon'] ?? 'circle') . ' nav-icon"></i><p>' . $sub_menu['name'] . '</p></a></li>';
 								}
 								?>
 								<li class="nav-item has-treeview<?php echo($used_menu ? ' menu-open' : '') ?>">
 									<a href="#" class="nav-link<?php echo($used_menu ? ' active' : '') ?>">
-										<i class="nav-icon fas fa-<?php echo(isset($menu['icon']) ? $menu['icon'] : 'link') ?>"></i>
+										<i class="nav-icon fas fa-<?php echo($menu['icon'] ?? 'link') ?>"></i>
 										<p><?php echo $menu['name'] ?></p><i class="right fas fa-angle-left"></i>
 									</a>
 									<ul class="nav nav-treeview">