diff --git a/Needlework.Net/Assets/Icons/home.png b/Needlework.Net/Assets/Icons/home.png
deleted file mode 100644
index 76b1031..0000000
Binary files a/Needlework.Net/Assets/Icons/home.png and /dev/null differ
diff --git a/Needlework.Net/Assets/Icons/info-circle.png b/Needlework.Net/Assets/Icons/info-circle.png
deleted file mode 100644
index 53ab7e7..0000000
Binary files a/Needlework.Net/Assets/Icons/info-circle.png and /dev/null differ
diff --git a/Needlework.Net/Assets/Icons/list-alt.png b/Needlework.Net/Assets/Icons/list-alt.png
deleted file mode 100644
index 60c71be..0000000
Binary files a/Needlework.Net/Assets/Icons/list-alt.png and /dev/null differ
diff --git a/Needlework.Net/Assets/Icons/plug.png b/Needlework.Net/Assets/Icons/plug.png
deleted file mode 100644
index e0f566a..0000000
Binary files a/Needlework.Net/Assets/Icons/plug.png and /dev/null differ
diff --git a/Needlework.Net/Assets/Icons/terminal.png b/Needlework.Net/Assets/Icons/terminal.png
deleted file mode 100644
index 2d12d6d..0000000
Binary files a/Needlework.Net/Assets/Icons/terminal.png and /dev/null differ
diff --git a/Needlework.Net/ViewModels/MainWindow/MainWindowViewModel.cs b/Needlework.Net/ViewModels/MainWindow/MainWindowViewModel.cs
index cde5527..58f869e 100644
--- a/Needlework.Net/ViewModels/MainWindow/MainWindowViewModel.cs
+++ b/Needlework.Net/ViewModels/MainWindow/MainWindowViewModel.cs
@@ -1,4 +1,6 @@
-using BlossomiShymae.Briar;
+using Avalonia;
+using Avalonia.Media;
+using BlossomiShymae.Briar;
 using BlossomiShymae.Briar.Utils;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
@@ -123,7 +125,19 @@ public partial class MainWindowViewModel
     {
         Content = page.DisplayName,
         Tag = page,
-        IconSource = new BitmapIconSource() { UriSource = new Uri($"avares://NeedleworkDotNet/Assets/Icons/{page.Icon}.png") }
+        IconSource = new ImageIconSource
+        {
+            Source = new Projektanker.Icons.Avalonia.IconImage()
+            {
+                Value = page.Icon,
+                Brush = new SolidColorBrush(Application.Current!.ActualThemeVariant.Key switch
+                {
+                    "Light" => Colors.Black,
+                    "Dark" => Colors.White,
+                    _ => Colors.Gray
+                })
+            }
+        }
     };
 
     partial void OnSelectedNavigationViewItemChanged(NavigationViewItem value)
diff --git a/Needlework.Net/ViewModels/Pages/About/AboutViewModel.cs b/Needlework.Net/ViewModels/Pages/About/AboutViewModel.cs
index b738f72..031b29b 100644
--- a/Needlework.Net/ViewModels/Pages/About/AboutViewModel.cs
+++ b/Needlework.Net/ViewModels/Pages/About/AboutViewModel.cs
@@ -6,7 +6,7 @@ namespace Needlework.Net.ViewModels.Pages.About;
 
 public partial class AboutViewModel : PageBase
 {
-    public AboutViewModel() : base("About", "info-circle")
+    public AboutViewModel() : base("About", "fa-solid fa-circle-info")
     {
     }
 
diff --git a/Needlework.Net/ViewModels/Pages/Console/ConsoleViewModel.cs b/Needlework.Net/ViewModels/Pages/Console/ConsoleViewModel.cs
index 12bfecd..495a873 100644
--- a/Needlework.Net/ViewModels/Pages/Console/ConsoleViewModel.cs
+++ b/Needlework.Net/ViewModels/Pages/Console/ConsoleViewModel.cs
@@ -12,7 +12,7 @@ public partial class ConsoleViewModel : PageBase
 {
     private readonly DocumentService _documentService;
 
-    public ConsoleViewModel(DocumentService documentService, NotificationService notificationService) : base("Console", "terminal", -200)
+    public ConsoleViewModel(DocumentService documentService, NotificationService notificationService) : base("Console", "fa-solid fa-terminal", -200)
     {
         _request = new(notificationService, Endpoints.Tab.LCU);
         _documentService = documentService;
diff --git a/Needlework.Net/ViewModels/Pages/Endpoints/EndpointsViewModel.cs b/Needlework.Net/ViewModels/Pages/Endpoints/EndpointsViewModel.cs
index 7942849..3772ec5 100644
--- a/Needlework.Net/ViewModels/Pages/Endpoints/EndpointsViewModel.cs
+++ b/Needlework.Net/ViewModels/Pages/Endpoints/EndpointsViewModel.cs
@@ -22,7 +22,7 @@ public partial class EndpointsViewModel : PageBase
 
     private readonly NotificationService _notificationService;
 
-    public EndpointsViewModel(DocumentService documentService, NotificationService notificationService) : base("Endpoints", "list-alt", -500)
+    public EndpointsViewModel(DocumentService documentService, NotificationService notificationService) : base("Endpoints", "fa-solid fa-rectangle-list", -500)
     {
         _documentService = documentService;
         _notificationService = notificationService;
diff --git a/Needlework.Net/ViewModels/Pages/Home/HomeViewModel.cs b/Needlework.Net/ViewModels/Pages/Home/HomeViewModel.cs
index 072feb6..2294685 100644
--- a/Needlework.Net/ViewModels/Pages/Home/HomeViewModel.cs
+++ b/Needlework.Net/ViewModels/Pages/Home/HomeViewModel.cs
@@ -12,7 +12,7 @@ namespace Needlework.Net.ViewModels.Pages.Home;
 
 public partial class HomeViewModel : PageBase
 {
-    public HomeViewModel() : base("Home", "home", int.MinValue) { }
+    public HomeViewModel() : base("Home", "fa-solid fa-house", int.MinValue) { }
 
     public List<LibraryViewModel> Libraries { get; } = JsonSerializer.Deserialize<List<Library>>(AssetLoader.Open(new Uri($"avares://NeedleworkDotNet/Assets/libraries.json")))
         !.Where(library => library.Tags.Contains("lcu") || library.Tags.Contains("ingame"))
diff --git a/Needlework.Net/ViewModels/Pages/Websocket/WebsocketViewModel.cs b/Needlework.Net/ViewModels/Pages/Websocket/WebsocketViewModel.cs
index 08a2390..8382423 100644
--- a/Needlework.Net/ViewModels/Pages/Websocket/WebsocketViewModel.cs
+++ b/Needlework.Net/ViewModels/Pages/Websocket/WebsocketViewModel.cs
@@ -33,7 +33,7 @@ public partial class WebSocketViewModel : PageBase, IEnableLogger
 
     private readonly object _tokenLock = new();
 
-    public WebSocketViewModel(IFlurlClientCache clients, NotificationService notificationService) : base("Event Viewer", "plug", -100)
+    public WebSocketViewModel(IFlurlClientCache clients, NotificationService notificationService) : base("Event Viewer", "fa-solid fa-plug", -100)
     {
         _githubUserContentClient = clients.Get("GithubUserContentClient");
         _notificationService = notificationService;