diff --git a/src/Ryujinx.UI.Common/App/ApplicationData.cs b/src/Ryujinx.UI.Common/App/ApplicationData.cs
index 517a0c857..51ac87b5a 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationData.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationData.cs
@@ -38,6 +38,8 @@ namespace Ryujinx.UI.App.Common
 
         public bool IsGame => FileExtension != "Folder";
 
+        public bool IsFolder => FileExtension == "Folder";
+
         public static string GetApplicationBuildId(VirtualFileSystem virtualFileSystem, string titleFilePath)
         {
             using FileStream file = new(titleFilePath, FileMode.Open, FileAccess.Read);
diff --git a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
index ccd707058..508794127 100644
--- a/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
+++ b/src/Ryujinx.UI.Common/App/ApplicationLibrary.cs
@@ -41,7 +41,6 @@ namespace Ryujinx.UI.App.Common
         private readonly byte[] _ncaIcon;
         private readonly byte[] _nroIcon;
         private readonly byte[] _nsoIcon;
-        private readonly byte[] _folderIcon;
 
         private readonly VirtualFileSystem _virtualFileSystem;
         private Language _desiredTitleLanguage;
@@ -59,11 +58,15 @@ namespace Ryujinx.UI.App.Common
             _ncaIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NCA.png");
             _nroIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NRO.png");
             _nsoIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_NSO.png");
-            _folderIcon = GetResourceBytes("Ryujinx.UI.Common.Resources.Icon_Folder.png");
         }
 
         private static byte[] GetResourceBytes(string resourceName)
         {
+            if (resourceName == "")
+            {
+                return Array.Empty<byte>();
+            }
+
             Stream resourceStream = Assembly.GetCallingAssembly().GetManifestResourceStream(resourceName);
             byte[] resourceByteArray = new byte[resourceStream.Length];
 
@@ -131,7 +134,6 @@ namespace Ryujinx.UI.App.Common
                                 TitleName = fileInfo.Name,
                                 FileExtension = "Folder",
                                 Path = fullPath,
-                                Icon = _folderIcon,
                             };
                             OnApplicationAdded(new ApplicationAddedEventArgs
                             {
diff --git a/src/Ryujinx.UI.Common/Resources/Icon_Folder.png b/src/Ryujinx.UI.Common/Resources/Icon_Folder.png
deleted file mode 100644
index dba7ff44d..000000000
Binary files a/src/Ryujinx.UI.Common/Resources/Icon_Folder.png and /dev/null differ
diff --git a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
index eb84aad61..387e998b0 100644
--- a/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
+++ b/src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj
@@ -15,7 +15,6 @@
     <None Remove="Resources\Icon_NSO.png" />
     <None Remove="Resources\Icon_NSP.png" />
     <None Remove="Resources\Icon_XCI.png" />
-    <None Remove="Resources\Icon_Folder.png" />
     <None Remove="Resources\Logo_Amiibo.png" />
     <None Remove="Resources\Logo_Discord.png" />
     <None Remove="Resources\Logo_GitHub.png" />
@@ -34,7 +33,6 @@
     <EmbeddedResource Include="Resources\Icon_NSO.png" />
     <EmbeddedResource Include="Resources\Icon_NSP.png" />
     <EmbeddedResource Include="Resources\Icon_XCI.png" />
-    <EmbeddedResource Include="Resources\Icon_Folder.png" />
     <EmbeddedResource Include="Resources\Logo_Amiibo.png" />
     <EmbeddedResource Include="Resources\Logo_Ryujinx.png" />
     <EmbeddedResource Include="Resources\Logo_Discord_Dark.png" />
diff --git a/src/Ryujinx/Assets/Styles/Styles.xaml b/src/Ryujinx/Assets/Styles/Styles.xaml
index f7f64be22..20c435d08 100644
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -86,6 +86,38 @@
         <Setter Property="Width"
                 Value="120" />
     </Style>
+    <Style Selector="ui|SymbolIcon.listSmall">
+        <Setter Property="FontSize"
+                Value="50" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.listNormal">
+        <Setter Property="FontSize"
+                Value="80" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.listLarge">
+        <Setter Property="FontSize"
+                Value="100" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.listHuge">
+        <Setter Property="FontSize"
+                Value="120" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridSmall">
+        <Setter Property="FontSize"
+                Value="100" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridNormal">
+        <Setter Property="FontSize"
+                Value="130" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridLarge">
+        <Setter Property="FontSize"
+                Value="140" />
+    </Style>
+    <Style Selector="ui|SymbolIcon.gridHuge">
+        <Setter Property="FontSize"
+                Value="180" />
+    </Style>
     <Style Selector="#TitleBarHost &gt; Image">
         <Setter Property="Margin"
                 Value="10" />
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
index 2dc95662a..7ba6642ab 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -69,7 +69,16 @@
                                     Grid.Row="0"
                                     HorizontalAlignment="Stretch"
                                     VerticalAlignment="Top"
+                                    IsVisible="{Binding IsGame}"
                                     Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
+                                <ui:SymbolIcon
+                                    Grid.Row="0"
+                                    Classes.gridHuge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridHuge}"
+                                    Classes.gridLarge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}"
+                                    Classes.gridNormal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
+                                    Classes.gridSmall="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
+                                    IsVisible="{Binding IsFolder}"
+                                    Symbol="Folder" />
                                 <Panel
                                     Grid.Row="1"
                                     Height="50"
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
index 61e797736..ce1ce6453 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -71,7 +71,17 @@
                                     Classes.large="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}"
                                     Classes.normal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
                                     Classes.small="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
+                                    IsVisible="{Binding IsGame}"
                                     Source="{Binding Icon, Converter={StaticResource ByteImage}}" />
+                                <ui:SymbolIcon
+                                    Grid.RowSpan="3"
+                                    Grid.Column="0"
+                                    Classes.listHuge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridHuge}"
+                                    Classes.listLarge="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridLarge}"
+                                    Classes.listNormal="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridMedium}"
+                                    Classes.listSmall="{Binding $parent[UserControl].((viewModels:MainWindowViewModel)DataContext).IsGridSmall}"
+                                    IsVisible="{Binding IsFolder}"
+                                    Symbol="Folder" />
                                 <Border
                                     Grid.Column="2"
                                     Margin="0,0,5,0"
diff --git a/src/Ryujinx/UI/Helpers/Glyph.cs b/src/Ryujinx/UI/Helpers/Glyph.cs
index d44f0875a..b071140b8 100644
--- a/src/Ryujinx/UI/Helpers/Glyph.cs
+++ b/src/Ryujinx/UI/Helpers/Glyph.cs
@@ -6,5 +6,6 @@ namespace Ryujinx.Ava.UI.Helpers
         Grid,
         Back,
         Chip,
+        Folder,
     }
 }
diff --git a/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
index 9731123e9..4fe7a5d1f 100644
--- a/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
+++ b/src/Ryujinx/UI/Helpers/GlyphValueConverter.cs
@@ -15,6 +15,7 @@ namespace Ryujinx.Ava.UI.Helpers
             { Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
             { Glyph.Back, char.ConvertFromUtf32((int)Symbol.Back) },
             { Glyph.Chip, char.ConvertFromUtf32(59748) },
+            { Glyph.Folder, char.ConvertFromUtf32(61739) },
         };
 
         public GlyphValueConverter(string key)