diff --git a/LM-Kit-Maestro/MauiProgram.cs b/LM-Kit-Maestro/MauiProgram.cs
index 33b9d7a..783751c 100644
--- a/LM-Kit-Maestro/MauiProgram.cs
+++ b/LM-Kit-Maestro/MauiProgram.cs
@@ -40,11 +40,10 @@ public static MauiApp CreateMauiApp()
                     fonts.AddFont("Segoe UI Bold.ttf", "SegoeBold");
 
                     fonts.AddFont("MaterialIcons-Regular.ttf", "Material");
-                    //fonts.AddFont("fontawesome-webfont.ttf", "Material");
-                    //fonts.AddFont("FontAwesome.ttf", "Material");
+                    fonts.AddFont("Font Awesome 6 Free-Solid-900.ttf", "FA");
                     // FontAwesome
                     //fonts.AddFont("Font Awesome 6 Free-Regular-400.otf", "FARegular");
-                    //fonts.AddFont("Font Awesome 6 Free-Solid-900.otf", "Material");
+                    //fonts.AddFont("Font Awesome 6 Free-Solid-900.otf", "FA");
                 })
                 .ConfigureMauiHandlers(handlers =>
                 {
diff --git a/LM-Kit-Maestro/Resources/Fonts/Font Awesome 6 Free-Solid-900.ttf b/LM-Kit-Maestro/Resources/Fonts/Font Awesome 6 Free-Solid-900.ttf
new file mode 100644
index 0000000..cff20d4
Binary files /dev/null and b/LM-Kit-Maestro/Resources/Fonts/Font Awesome 6 Free-Solid-900.ttf differ
diff --git a/LM-Kit-Maestro/Resources/Styles/Styles.xaml b/LM-Kit-Maestro/Resources/Styles/Styles.xaml
index 2b77427..0f170bd 100644
--- a/LM-Kit-Maestro/Resources/Styles/Styles.xaml
+++ b/LM-Kit-Maestro/Resources/Styles/Styles.xaml
@@ -95,7 +95,7 @@
         <Setter Property="WidthRequest" Value="{x:Static local:AppConstants.ChatPageToggleButtonWidth}"/>
         <Setter Property="HeightRequest" Value="{x:Static local:AppConstants.ChatPageToggleButtonWidth}"/>
         <Setter Property="VerticalOptions" Value="Center"/>
-        <Setter Property="FontFamily" Value="FASolid"/>
+        <Setter Property="FontFamily" Value="FA"/>
         <Setter Property="FontSize" Value="12"/>
         <Setter Property="Padding" Value="8"/>
         <Setter Property="BorderWidth" Value="0"/>
@@ -128,7 +128,7 @@
     </Style>
     
     <Style x:Key="SecondaryActionButtonStyle" TargetType="Button">
-        <Setter Property="FontFamily" Value="FASolid"/>
+        <Setter Property="FontFamily" Value="FA"/>
         <Setter Property="CornerRadius" Value="16"/>
         <Setter Property="Padding" Value="8"/>
         <Setter Property="FontSize" Value="12"/>
@@ -278,12 +278,12 @@
     </Style>
 
     <Style TargetType="Label" Class="IconSmall">
-        <Setter Property="FontFamily" Value="FASolid"/>
+        <Setter Property="FontFamily" Value="FA"/>
         <Setter Property="FontSize" Value="9"/>
     </Style>
     
     <Style TargetType="Label" Class="Icon">
-        <Setter Property="FontFamily" Value="FASolid"/>
+        <Setter Property="FontFamily" Value="FA"/>
         <Setter Property="FontSize" Value="12"/>
     </Style>
 
diff --git a/LM-Kit-Maestro/UI/ConversationListItemView.xaml b/LM-Kit-Maestro/UI/ConversationListItemView.xaml
index 09fcccb..b17aa82 100644
--- a/LM-Kit-Maestro/UI/ConversationListItemView.xaml
+++ b/LM-Kit-Maestro/UI/ConversationListItemView.xaml
@@ -162,7 +162,7 @@
                     Grid.Column="2"
                     FontSize="16"
                     Clicked="OnShowMoreButtonClicked"
-                    FontFamily="FASolid"
+                    FontFamily="FA"
                     Text="{StaticResource Ellipsis}">
                     <Button.IsVisible>
                         <MultiBinding Converter="{StaticResource AnyTrueConverter}">
diff --git a/LM-Kit-Maestro/UI/ModelSelectionButton.xaml b/LM-Kit-Maestro/UI/ModelSelectionButton.xaml
index 6924774..0dc2bb3 100644
--- a/LM-Kit-Maestro/UI/ModelSelectionButton.xaml
+++ b/LM-Kit-Maestro/UI/ModelSelectionButton.xaml
@@ -25,7 +25,7 @@
                 <Setter Property="Padding" Value="0"/>
                 <Setter Property="ToolTipProperties.Text" Value="Eject model"/>
                 <Setter Property="TextColor" Value="{StaticResource Primary}"/>
-                <Setter Property="FontFamily" Value="FASolid"/>
+                <Setter Property="FontFamily" Value="FA"/>
                 <Setter Property="FontSize" Value="9"/>
                 <Setter Property="Text" Value="{StaticResource Eject}"/>
                 <Setter Property="VisualStateManager.VisualStateGroups">
@@ -174,7 +174,6 @@
                         VerticalOptions="Center"
                         StyleClass="IconSmall"
                         TextColor="{StaticResource Outline}"
-                        Text="{StaticResource ChevronDown}">
                         <Label.Triggers>
                             <DataTrigger TargetType="Label" Binding="{Binding Source={x:RelativeSource AncestorType={x:Type vm:AppShellViewModel}}, Path=AppIsInitialized}" Value="False">
                                 <Setter Property="IsVisible" Value="False"/>
diff --git a/LM-Kit-Maestro/UI/Pages/ChatPage.xaml b/LM-Kit-Maestro/UI/Pages/ChatPage.xaml
index cda3e27..03ae9cc 100644
--- a/LM-Kit-Maestro/UI/Pages/ChatPage.xaml
+++ b/LM-Kit-Maestro/UI/Pages/ChatPage.xaml
@@ -88,7 +88,7 @@
 
                 <Button
                     Style="{StaticResource SidebarToggleButtonStyle}"
-                    Text="{StaticResource Comments}"
+                    Text="{StaticResource ChevronDown}"
                     Command="{Binding ToggleChatsSidebarCommand}"
                     HorizontalOptions="Start"/>
 
@@ -103,7 +103,7 @@
                     ToolTipProperties.Text="Start a new chat"
                     Style="{StaticResource SecondaryActionButtonStyle}"
                     Grid.Column="2" 
-                    FontFamily="FASolid"
+                    FontFamily="FA"
                     Text="{StaticResource Plus}"
                     Command="{Binding StartNewConversationCommand}"/>
             </Grid>
diff --git a/LM-Kit-Maestro/UI/Popups/UnsortedModelFilesPopup.xaml b/LM-Kit-Maestro/UI/Popups/UnsortedModelFilesPopup.xaml
index 088f67e..90f2a12 100644
--- a/LM-Kit-Maestro/UI/Popups/UnsortedModelFilesPopup.xaml
+++ b/LM-Kit-Maestro/UI/Popups/UnsortedModelFilesPopup.xaml
@@ -32,23 +32,23 @@
                 <Border Style="{StaticResource InnerBorderStyle}" Grid.Row="1">
                     <VerticalStackLayout Margin="8, 0" Spacing="6">
                         <HorizontalStackLayout Spacing="8">
-                            <Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FASolid" Text="{StaticResource Folder}"/>
+                            <Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FA" Text="{StaticResource Folder}"/>
                             <Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" Text="Models folder"/>
                         </HorizontalStackLayout>
 
                         <HorizontalStackLayout Margin="20, 0" Spacing="6">
-                            <Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FASolid" Text="{StaticResource Folder}"/>
+                            <Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FA" Text="{StaticResource Folder}"/>
                             <Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" Text="Publisher"/>
                         </HorizontalStackLayout>
 
 
                         <HorizontalStackLayout Margin="40, 0" Spacing="6">
-                            <Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FASolid" Text="{StaticResource Folder}"/>
+                            <Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" FontFamily="FA" Text="{StaticResource Folder}"/>
                             <Label TextColor="{StaticResource OnSurface}" VerticalOptions="Center" Text="Repository"/>
                         </HorizontalStackLayout>
 
                         <HorizontalStackLayout Margin="60, 0" Spacing="0">
-                            <Label TextColor="Transparent" VerticalOptions="Center" FontFamily="FASolid" Text="{StaticResource Folder}"/>
+                            <Label TextColor="Transparent" VerticalOptions="Center" FontFamily="FA" Text="{StaticResource Folder}"/>
                             <Label TextColor="{StaticResource Primary}" Text=" model file.gguf"/>
                         </HorizontalStackLayout>