diff --git a/appveyor.yml b/appveyor.yml
index e7a3b801..6d8ce160 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,7 +19,7 @@ skip_commits:
     - docs/*
     - '**/*.html'
     - '**/*.md'
-version: '3.11.2.{build}'
+version: '3.11.3.{build}'
 skip_tags: true
 image: Visual Studio 2017
 clone_folder: c:\project\gallifrey
diff --git a/paket.dependencies b/paket.dependencies
index 3df82890..463bfadb 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -5,7 +5,7 @@ nuget Atlassian.SDK @= 2.5.0
 nuget FAKE ~> 4
 nuget Exceptionless.Wpf
 nuget MahApps.Metro prerelease
-nuget MahApps.Metro.IconPacks.Material
+nuget MahApps.Metro.IconPacks.FontAwesome
 nuget Newtonsoft.Json
 nuget RestSharp
 nuget Octokit
diff --git a/paket.lock b/paket.lock
index 325a1239..f4937c2b 100644
--- a/paket.lock
+++ b/paket.lock
@@ -9,7 +9,7 @@ NUGET
     FAKE (4.64.13)
     MahApps.Metro (1.6.5)
       ControlzEx (>= 3.0.2.4 < 4.0)
-    MahApps.Metro.IconPacks.Material (2.3)
+    MahApps.Metro.IconPacks.FontAwesome (2.3)
       ControlzEx (>= 3.0.2.4 < 4.0)
     Newtonsoft.Json (11.0.2)
     Octokit (0.31)
diff --git a/src/Gallifrey.UI.Modern.Alpha/App.xaml b/src/Gallifrey.UI.Modern.Alpha/App.xaml
index e236c52a..5a3c4fa3 100644
--- a/src/Gallifrey.UI.Modern.Alpha/App.xaml
+++ b/src/Gallifrey.UI.Modern.Alpha/App.xaml
@@ -12,7 +12,7 @@
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
-                <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.Material;component/Themes/PackIconMaterial.xaml" />
+                <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.FontAwesome;component/Themes/PackIconFontAwesome.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/Gallifrey.UI.Modern.Alpha/Gallifrey.UI.Modern.Alpha.csproj b/src/Gallifrey.UI.Modern.Alpha/Gallifrey.UI.Modern.Alpha.csproj
index 3eaf47f1..03cbff26 100644
--- a/src/Gallifrey.UI.Modern.Alpha/Gallifrey.UI.Modern.Alpha.csproj
+++ b/src/Gallifrey.UI.Modern.Alpha/Gallifrey.UI.Modern.Alpha.csproj
@@ -288,8 +288,8 @@
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
       <ItemGroup>
-        <Reference Include="MahApps.Metro.IconPacks.Material">
-          <HintPath>..\..\packages\MahApps.Metro.IconPacks.Material\lib\net46\MahApps.Metro.IconPacks.Material.dll</HintPath>
+        <Reference Include="MahApps.Metro.IconPacks.FontAwesome">
+          <HintPath>..\..\packages\MahApps.Metro.IconPacks.FontAwesome\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
diff --git a/src/Gallifrey.UI.Modern.Alpha/paket.references b/src/Gallifrey.UI.Modern.Alpha/paket.references
index 33f1e023..17babadd 100644
--- a/src/Gallifrey.UI.Modern.Alpha/paket.references
+++ b/src/Gallifrey.UI.Modern.Alpha/paket.references
@@ -1,3 +1,3 @@
 Exceptionless.Wpf
 MahApps.Metro
-MahApps.Metro.IconPacks.Material
+MahApps.Metro.IconPacks.FontAwesome
diff --git a/src/Gallifrey.UI.Modern.Beta/App.xaml b/src/Gallifrey.UI.Modern.Beta/App.xaml
index ec804785..b407ce39 100644
--- a/src/Gallifrey.UI.Modern.Beta/App.xaml
+++ b/src/Gallifrey.UI.Modern.Beta/App.xaml
@@ -12,7 +12,7 @@
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
-                <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.Material;component/Themes/PackIconMaterial.xaml" />
+                <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.FontAwesome;component/Themes/PackIconFontAwesome.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/Gallifrey.UI.Modern.Beta/Gallifrey.UI.Modern.Beta.csproj b/src/Gallifrey.UI.Modern.Beta/Gallifrey.UI.Modern.Beta.csproj
index 12011f75..b50dce25 100644
--- a/src/Gallifrey.UI.Modern.Beta/Gallifrey.UI.Modern.Beta.csproj
+++ b/src/Gallifrey.UI.Modern.Beta/Gallifrey.UI.Modern.Beta.csproj
@@ -288,8 +288,8 @@
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
       <ItemGroup>
-        <Reference Include="MahApps.Metro.IconPacks.Material">
-          <HintPath>..\..\packages\MahApps.Metro.IconPacks.Material\lib\net46\MahApps.Metro.IconPacks.Material.dll</HintPath>
+        <Reference Include="MahApps.Metro.IconPacks.FontAwesome">
+          <HintPath>..\..\packages\MahApps.Metro.IconPacks.FontAwesome\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
diff --git a/src/Gallifrey.UI.Modern.Beta/paket.references b/src/Gallifrey.UI.Modern.Beta/paket.references
index 33f1e023..17babadd 100644
--- a/src/Gallifrey.UI.Modern.Beta/paket.references
+++ b/src/Gallifrey.UI.Modern.Beta/paket.references
@@ -1,3 +1,3 @@
 Exceptionless.Wpf
 MahApps.Metro
-MahApps.Metro.IconPacks.Material
+MahApps.Metro.IconPacks.FontAwesome
diff --git a/src/Gallifrey.UI.Modern.Stable/App.xaml b/src/Gallifrey.UI.Modern.Stable/App.xaml
index cc8867c1..b32afdf7 100644
--- a/src/Gallifrey.UI.Modern.Stable/App.xaml
+++ b/src/Gallifrey.UI.Modern.Stable/App.xaml
@@ -12,7 +12,7 @@
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
-                <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.Material;component/Themes/PackIconMaterial.xaml" />
+                <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.FontAwesome;component/Themes/PackIconFontAwesome.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/Gallifrey.UI.Modern.Stable/Gallifrey.UI.Modern.Stable.csproj b/src/Gallifrey.UI.Modern.Stable/Gallifrey.UI.Modern.Stable.csproj
index c1ad1195..211b7c9b 100644
--- a/src/Gallifrey.UI.Modern.Stable/Gallifrey.UI.Modern.Stable.csproj
+++ b/src/Gallifrey.UI.Modern.Stable/Gallifrey.UI.Modern.Stable.csproj
@@ -288,8 +288,8 @@
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
       <ItemGroup>
-        <Reference Include="MahApps.Metro.IconPacks.Material">
-          <HintPath>..\..\packages\MahApps.Metro.IconPacks.Material\lib\net46\MahApps.Metro.IconPacks.Material.dll</HintPath>
+        <Reference Include="MahApps.Metro.IconPacks.FontAwesome">
+          <HintPath>..\..\packages\MahApps.Metro.IconPacks.FontAwesome\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
diff --git a/src/Gallifrey.UI.Modern.Stable/paket.references b/src/Gallifrey.UI.Modern.Stable/paket.references
index 33f1e023..17babadd 100644
--- a/src/Gallifrey.UI.Modern.Stable/paket.references
+++ b/src/Gallifrey.UI.Modern.Stable/paket.references
@@ -1,3 +1,3 @@
 Exceptionless.Wpf
 MahApps.Metro
-MahApps.Metro.IconPacks.Material
+MahApps.Metro.IconPacks.FontAwesome
diff --git a/src/Gallifrey.UI.Modern/App.xaml b/src/Gallifrey.UI.Modern/App.xaml
index e5da2553..b8c3ee1a 100644
--- a/src/Gallifrey.UI.Modern/App.xaml
+++ b/src/Gallifrey.UI.Modern/App.xaml
@@ -12,7 +12,7 @@
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
                 <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
-                <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.Material;component/Themes/PackIconMaterial.xaml" />
+                <helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.FontAwesome;component/Themes/PackIconFontAwesome.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/src/Gallifrey.UI.Modern/ChangeLog.xml b/src/Gallifrey.UI.Modern/ChangeLog.xml
index d0b5ae39..c6b04b08 100644
--- a/src/Gallifrey.UI.Modern/ChangeLog.xml
+++ b/src/Gallifrey.UI.Modern/ChangeLog.xml
@@ -503,6 +503,13 @@
     </Bugs>
     <Others/>
   </Version>
+  <Version Number="3.11.3.0" Name="">
+    <Features/>
+    <Bugs />
+    <Others>
+      <Other>Icon updates</Other>
+    </Others>
+  </Version>
   <!--
   Template for VNext if not present above
   <Version Number="0.0.0.0" Name="Pre-Release">
diff --git a/src/Gallifrey.UI.Modern/Flyouts/AddTimer.xaml b/src/Gallifrey.UI.Modern/Flyouts/AddTimer.xaml
index baba8a12..dd858d6d 100644
--- a/src/Gallifrey.UI.Modern/Flyouts/AddTimer.xaml
+++ b/src/Gallifrey.UI.Modern/Flyouts/AddTimer.xaml
@@ -94,10 +94,10 @@
 
         <StackPanel Orientation="Horizontal" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center">
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SearchButton" ToolTip="Search Jira">
-                <iconPacks:PackIconMaterial Kind="CloudSearch" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="SearchSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="AddButton" IsDefault="True" ToolTip="Add Timer">
-                <iconPacks:PackIconMaterial Kind="PlusCircle" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="PlusCircleSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
         </StackPanel>
     </Grid>
diff --git a/src/Gallifrey.UI.Modern/Flyouts/BulkExport.xaml b/src/Gallifrey.UI.Modern/Flyouts/BulkExport.xaml
index fc0b2692..3ef4c5eb 100644
--- a/src/Gallifrey.UI.Modern/Flyouts/BulkExport.xaml
+++ b/src/Gallifrey.UI.Modern/Flyouts/BulkExport.xaml
@@ -129,10 +129,10 @@
         </controls:MetroAnimatedSingleRowTabControl>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,5" Click="ExportAllButton" ToolTip="Check All For Export">
-                <iconPacks:PackIconMaterial Kind="CheckAll" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="CheckDoubleSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,5"   Click="ExportButton" IsDefault="True" ToolTip="Export Checked Worklogs To Jira">
-                <iconPacks:PackIconMaterial Kind="CloudUpload" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,2,0" />
+                <iconPacks:PackIconFontAwesome Kind="UploadSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,2,0" />
             </Button>
         </StackPanel>
     </Grid>
diff --git a/src/Gallifrey.UI.Modern/Flyouts/EditTimer.xaml b/src/Gallifrey.UI.Modern/Flyouts/EditTimer.xaml
index 0148958a..9642cbbf 100644
--- a/src/Gallifrey.UI.Modern/Flyouts/EditTimer.xaml
+++ b/src/Gallifrey.UI.Modern/Flyouts/EditTimer.xaml
@@ -63,16 +63,16 @@
 
         <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center">
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SearchButton" ToolTip="Search Jira">
-                <iconPacks:PackIconMaterial Kind="CloudSearch" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="SearchSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="AddTime" ToolTip="Add X Minutes">
-                <iconPacks:PackIconMaterial Kind="Plus" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="PlusSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SubtractTime" ToolTip="Subtract X Minutes">
-                <iconPacks:PackIconMaterial Kind="Minus" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="MinusSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SaveButton" IsDefault="{Binding IsDefaultOnButton, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ToolTip="Save Timer Changes">
-                <iconPacks:PackIconMaterial Kind="ContentSave" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="SaveSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
         </StackPanel>
     </Grid>
diff --git a/src/Gallifrey.UI.Modern/Flyouts/Error.xaml b/src/Gallifrey.UI.Modern/Flyouts/Error.xaml
index 4303f387..22400a9b 100644
--- a/src/Gallifrey.UI.Modern/Flyouts/Error.xaml
+++ b/src/Gallifrey.UI.Modern/Flyouts/Error.xaml
@@ -21,7 +21,7 @@
         <TextBlock Padding="5">Description</TextBlock>
         <TextBox Text="{Binding Description, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" MaxLines="3" MinLines="3" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Optional"/>
         <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2" Click="SendReport" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" IsDefault="True" ToolTip="Submit Error Report">
-            <iconPacks:PackIconMaterial Kind="Send" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            <iconPacks:PackIconFontAwesome Kind="ShareSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
         </Button>
     </StackPanel>
 </controls:Flyout>
diff --git a/src/Gallifrey.UI.Modern/Flyouts/Export.xaml b/src/Gallifrey.UI.Modern/Flyouts/Export.xaml
index 02713ed5..d8b4bd27 100644
--- a/src/Gallifrey.UI.Modern/Flyouts/Export.xaml
+++ b/src/Gallifrey.UI.Modern/Flyouts/Export.xaml
@@ -96,7 +96,7 @@
             <controls:ToggleSwitchButton Grid.Row="11" Grid.Column="1" Margin="0,5" Style="{DynamicResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}" HorizontalAlignment="Left" IsChecked="{Binding ChangeStatus, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Click="ChangeStatusClick"/>
 
             <Button Grid.Row="12" Grid.Column="0" Grid.ColumnSpan="2" Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="ExportButton" IsDefault="True" ToolTip="Export Worklog To Jira">
-                <iconPacks:PackIconMaterial Kind="CloudUpload" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="UploadSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
         </Grid>
     </ScrollViewer>
diff --git a/src/Gallifrey.UI.Modern/Flyouts/Information.xaml b/src/Gallifrey.UI.Modern/Flyouts/Information.xaml
index 07c478a1..0fddf715 100644
--- a/src/Gallifrey.UI.Modern/Flyouts/Information.xaml
+++ b/src/Gallifrey.UI.Modern/Flyouts/Information.xaml
@@ -25,7 +25,7 @@
             <TextBlock Grid.Row="0" Grid.ColumnSpan="2" FontSize="18" Margin="0,0,0,5" Text="About" TextDecorations="Underline" />
             <TextBlock Grid.Row="1" Grid.Column="0" TextWrapping="Wrap" Margin="0,0,0,5" VerticalAlignment="Center">Gallifrey is a time logging companion designed to work with Jira time logs.<LineBreak />Gallifrey is open sourced on GitHub and free to download and contribute!</TextBlock>
             <Button Grid.Row="1" Grid.Column="1" Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="ChangeLogButton"  ToolTip="View Full Change Log">
-                <iconPacks:PackIconMaterial Kind="BookOpenPageVariant" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="BookOpenSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
         </Grid>
         <Grid Grid.Row="1">
diff --git a/src/Gallifrey.UI.Modern/Flyouts/LockedTimer.xaml b/src/Gallifrey.UI.Modern/Flyouts/LockedTimer.xaml
index bcd3fb5c..0033a7ca 100644
--- a/src/Gallifrey.UI.Modern/Flyouts/LockedTimer.xaml
+++ b/src/Gallifrey.UI.Modern/Flyouts/LockedTimer.xaml
@@ -57,10 +57,10 @@
         </ListView>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom">
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="AddButton" ToolTip="Add Selected Lock/Idle Timers">
-                <iconPacks:PackIconMaterial Kind="PlusCircle" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="PlusCircleSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="DeleteButton" ToolTip="Delete Selected Lock/Idle Timers">
-                <iconPacks:PackIconMaterial Kind="Delete" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="TrashAltSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
         </StackPanel>
     </Grid>
diff --git a/src/Gallifrey.UI.Modern/Flyouts/Search.xaml b/src/Gallifrey.UI.Modern/Flyouts/Search.xaml
index ee86615e..fa9f3cd2 100644
--- a/src/Gallifrey.UI.Modern/Flyouts/Search.xaml
+++ b/src/Gallifrey.UI.Modern/Flyouts/Search.xaml
@@ -34,7 +34,7 @@
         <ComboBox  Grid.Row="2" Grid.Column="1" Margin="5,5,0,5" ItemsSource="{Binding UserFilters}" SelectedItem="{Binding SelectedFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsSynchronizedWithCurrentItem="True" controls:TextBoxHelper.ClearTextButton="True"  IsEnabled="{Binding IsSearching, Converter={StaticResource BoolInvert}}" />
 
         <Button Style="{DynamicResource MetroCircleButtonStyle}" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Width="50" Height="50" Margin="2,0" Click="SearchButton" IsDefault="True" IsEnabled="{Binding IsSearching, Converter={StaticResource BoolInvert}}" ToolTip="Search Jira">
-            <iconPacks:PackIconMaterial Kind="Magnify" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            <iconPacks:PackIconFontAwesome Kind="SearchSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
         </Button>
 
         <ListView Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding SearchResults}" SelectedItem="{Binding SelectedSearchResult, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" BorderThickness="0" SelectionMode="Single">
@@ -65,10 +65,10 @@
         </ListView>
 
         <Button Style="{DynamicResource MetroCircleButtonStyle}" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" Width="50" Height="50" Margin="2,0" Click="AddTimer" IsEnabled="{Binding IsSearching, Converter={StaticResource BoolInvert}}" Visibility="{Binding OpenFromEdit, Converter={StaticResource BoolToVisInverted}}" ToolTip="Create Jira From Selected Search Result">
-            <iconPacks:PackIconMaterial Kind="PlusCircle" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            <iconPacks:PackIconFontAwesome Kind="PlusCircleSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
         </Button>
         <Button Style="{DynamicResource MetroCircleButtonStyle}" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" Width="50" Height="50" Margin="2,0" Click="AddTimer" IsEnabled="{Binding IsSearching, Converter={StaticResource BoolInvert}}" Visibility="{Binding OpenFromEdit, Converter={StaticResource BoolToVis}}" ToolTip="Use Jira From Selected Search Result In Edit">
-            <iconPacks:PackIconMaterial Kind="ContentSave" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            <iconPacks:PackIconFontAwesome Kind="SaveSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
         </Button>
     </Grid>
 </controls:Flyout>
diff --git a/src/Gallifrey.UI.Modern/Flyouts/Settings.xaml b/src/Gallifrey.UI.Modern/Flyouts/Settings.xaml
index c271e5d3..9305a101 100644
--- a/src/Gallifrey.UI.Modern/Flyouts/Settings.xaml
+++ b/src/Gallifrey.UI.Modern/Flyouts/Settings.xaml
@@ -229,7 +229,7 @@
 
         <WrapPanel HorizontalAlignment="Center" DockPanel.Dock="Bottom" VerticalAlignment="Bottom" Height="Auto">
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SaveSettings" IsDefault="True" ToolTip="Save Settings">
-                <iconPacks:PackIconMaterial Kind="ContentSave" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="SaveSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
         </WrapPanel>
     </DockPanel>
diff --git a/src/Gallifrey.UI.Modern/Gallifrey.UI.Modern.csproj b/src/Gallifrey.UI.Modern/Gallifrey.UI.Modern.csproj
index 844455fc..ed18a8a4 100644
--- a/src/Gallifrey.UI.Modern/Gallifrey.UI.Modern.csproj
+++ b/src/Gallifrey.UI.Modern/Gallifrey.UI.Modern.csproj
@@ -343,8 +343,8 @@
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
       <ItemGroup>
-        <Reference Include="MahApps.Metro.IconPacks.Material">
-          <HintPath>..\..\packages\MahApps.Metro.IconPacks.Material\lib\net46\MahApps.Metro.IconPacks.Material.dll</HintPath>
+        <Reference Include="MahApps.Metro.IconPacks.FontAwesome">
+          <HintPath>..\..\packages\MahApps.Metro.IconPacks.FontAwesome\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
diff --git a/src/Gallifrey.UI.Modern/MainViews/ControlButtons.xaml b/src/Gallifrey.UI.Modern/MainViews/ControlButtons.xaml
index 81ef0f4e..e90d9fc8 100644
--- a/src/Gallifrey.UI.Modern/MainViews/ControlButtons.xaml
+++ b/src/Gallifrey.UI.Modern/MainViews/ControlButtons.xaml
@@ -16,7 +16,7 @@
                         Add A New Timer<LineBreak/>F1 or CTRL + A
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="PlusCircle" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="PlusCircleSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="DeleteButton">
                 <Button.ToolTip>
@@ -24,7 +24,7 @@
                         Delete The Selected Timer(s)<LineBreak/>F2 or CTRL + D
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="Delete" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="TrashAltSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SearchButton">
                 <Button.ToolTip>
@@ -32,7 +32,7 @@
                        Search Jira<LineBreak/>F3 or CTRL + F
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="CloudSearch" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="SearchSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="EditButton">
                 <Button.ToolTip>
@@ -40,7 +40,7 @@
                         Edit The Selected Timer(s)<LineBreak/>F4 or CTRL + E
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="Pencil" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="PencilAltSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
 
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="ExportButton" Visibility="{Binding TrackingOnly, Converter={StaticResource BoolToVisInvert}}">
@@ -49,7 +49,7 @@
                         Export The Selected Timer(s)<LineBreak/>F5 or CTRL + U
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="CloudUpload" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="UploadSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SaveButton">
                 <Button.ToolTip>
@@ -57,7 +57,7 @@
                         Export Timers To CSV<LineBreak/>F6 or CTRL + B
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="FileDownload" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="FileDownloadSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="LockTimerButton">
                 <Button.ToolTip>
@@ -65,7 +65,7 @@
                         Show Locked/Idle Timers<LineBreak/>F7 or CTRL + L
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="LockClock" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="LockSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SettingsButton">
                 <Button.ToolTip>
@@ -73,7 +73,7 @@
                         View/Edit Settings<LineBreak/>F8 or CTRL + S
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="Settings" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="CogSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
         </WrapPanel>
 
@@ -84,7 +84,7 @@
                         Application Information<LineBreak/>CTRL + F1
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="InformationVariant" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="InfoCircleSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="TwitterButton">
                 <Button.ToolTip>
@@ -92,7 +92,7 @@
                         Contact Us On Twitter<LineBreak/>CTRL + F2
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="Twitter" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="TwitterBrands" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="EmailButton">
                 <Button.ToolTip>
@@ -100,7 +100,7 @@
                         Contact Us By Email<LineBreak/>CTRL + F3
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="At" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="AtSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SlackButton">
                 <Button.ToolTip>
@@ -108,7 +108,7 @@
                         Chat With Users Or Ask For Help On Slack<LineBreak/>CTRL + F4
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="Message" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="SlackBrands" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="GitHubButton">
                 <Button.ToolTip>
@@ -116,7 +116,7 @@
                         View The Code On GitHub<LineBreak/>CTRL + F5
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="GithubCircle" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="GithubBrands" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
             <Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="PayPalButton">
                 <Button.ToolTip>
@@ -124,7 +124,7 @@
                        Donate By PayPal<LineBreak/>CTRL + F6
                     </TextBlock>
                 </Button.ToolTip>
-                <iconPacks:PackIconMaterial Kind="Paypal" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                <iconPacks:PackIconFontAwesome Kind="PaypalBrands" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
             </Button>
         </WrapPanel>
     </DockPanel>
diff --git a/src/Gallifrey.UI.Modern/paket.references b/src/Gallifrey.UI.Modern/paket.references
index 152592af..23d607ff 100644
--- a/src/Gallifrey.UI.Modern/paket.references
+++ b/src/Gallifrey.UI.Modern/paket.references
@@ -1,5 +1,5 @@
 Exceptionless.Wpf
 MahApps.Metro
-MahApps.Metro.IconPacks.Material
+MahApps.Metro.IconPacks.FontAwesome
 ToastNotifications
 System.ValueTuple
\ No newline at end of file