diff --git a/Sharpnado.Tabs.nuspec b/Sharpnado.Tabs.nuspec
index 37da558..b51fd8d 100644
--- a/Sharpnado.Tabs.nuspec
+++ b/Sharpnado.Tabs.nuspec
@@ -15,13 +15,15 @@
       <repository type="git" branch="master" url="https://github.com/roubachof/Sharpnado.Tabs" />
       <summary>Including fixed tabs, scrollable tabs, bottom tabs, badge, segmented control, custom tabs, button tabs, ...</summary>
       <tags>xamarin.forms android ios uwp netstandard tabs segmented control bottombar fixed tabs scrollable tabs badge</tags>
-      <releaseNotes>Add MaterialTabItem a complete implementation of the material design tabs, including top icon and leading icon..</releaseNotes>
+      <releaseNotes>Add MaterialUnderlinedTabItem a complete implementation of the material design tabs, including top icon and leading icon.
+Add SVG image support</releaseNotes>
       <description>
 Pure Xamarin.Forms tabs:
   * Fixed tabs (android tabs style)  
   * Scrollable tabs
   * Vertical tabs
   * Material design tabs (top and leading icon)
+  * Support for SVG images
   * Segmented tabs
   * Custom shadows (neumorphism ready)
   * Badges on tabs
@@ -63,26 +65,26 @@ Pure Xamarin.Forms tabs:
       <dependencies>
 
         <group targetFramework=".NETStandard2.0">
-          <dependency id="Xamarin.Forms" version="4.7.0.968" exclude="Build,Analyzers"/>
-          <dependency id="Sharpnado.TaskMonitor" version="1.0.1" />
+          <dependency id="Xamarin.Forms" version="5.0.0.1874" exclude="Build,Analyzers"/>
+          <dependency id="Sharpnado.TaskMonitor" version="1.0.2" />
           <dependency id="Sharpnado.Shadows" version="1.2.0" />
         </group>
 
         <group targetFramework="Xamarin.iOS10">
-          <dependency id="Xamarin.Forms" version="4.7.0.968" exclude="Build,Analyzers"/>
-          <dependency id="Sharpnado.TaskMonitor" version="1.0.1" />
+          <dependency id="Xamarin.Forms" version="5.0.0.1874" exclude="Build,Analyzers"/>
+          <dependency id="Sharpnado.TaskMonitor" version="1.0.2" />
           <dependency id="Sharpnado.Shadows" version="1.2.0" />
         </group>
 
         <group targetFramework="MonoAndroid10">
-          <dependency id="Xamarin.Forms" version="4.7.0.968" exclude="Build,Analyzers"/>
-          <dependency id="Sharpnado.TaskMonitor" version="1.0.1" />
+          <dependency id="Xamarin.Forms" version="5.0.0.1874" exclude="Build,Analyzers"/>
+          <dependency id="Sharpnado.TaskMonitor" version="1.0.2" />
           <dependency id="Sharpnado.Shadows" version="1.2.0" />
         </group>
 
         <group targetFramework="uap10.0.16299">
-          <dependency id="Xamarin.Forms" version="4.7.0.968" exclude="Build,Analyzers"/>
-          <dependency id="Sharpnado.TaskMonitor" version="1.0.1" />
+          <dependency id="Xamarin.Forms" version="5.0.0.1874" exclude="Build,Analyzers"/>
+          <dependency id="Sharpnado.TaskMonitor" version="1.0.2" />
           <dependency id="Sharpnado.Shadows" version="1.2.0" />
           <dependency id="CompositionProToolkit" version="1.0.1" />
         </group>
diff --git a/Tabs/Tabs.Droid/AssemblyInfo.cs b/Tabs/Tabs.Droid/AssemblyInfo.cs
index b6aa44d..493ea77 100644
--- a/Tabs/Tabs.Droid/AssemblyInfo.cs
+++ b/Tabs/Tabs.Droid/AssemblyInfo.cs
@@ -1,20 +1,20 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, unde" +
-    "rlined tabs, scrollable tabs, badges...")]
+[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, mate" +
+    "rial tabs, underlined tabs, scrollable tabs, badges...")]
 [assembly: System.Reflection.AssemblyCompany("Sharpnado")]
 [assembly: System.Reflection.AssemblyProduct("Tabs")]
 [assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")]
-[assembly: System.Reflection.AssemblyFileVersion("2.1.0")]
-[assembly: System.Reflection.AssemblyVersion("2.1.0")]
+[assembly: System.Reflection.AssemblyFileVersion("2.2.0")]
+[assembly: System.Reflection.AssemblyVersion("2.2.0")]
 [assembly: System.Reflection.AssemblyTitle("Sharpnado.Tabs.Android")]
 
 
diff --git a/Tabs/Tabs.UWP/AssemblyInfo.cs b/Tabs/Tabs.UWP/AssemblyInfo.cs
index f8c7c91..5aa4696 100644
--- a/Tabs/Tabs.UWP/AssemblyInfo.cs
+++ b/Tabs/Tabs.UWP/AssemblyInfo.cs
@@ -1,20 +1,20 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, unde" +
-    "rlined tabs, scrollable tabs, badges...")]
+[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, mate" +
+    "rial tabs, underlined tabs, scrollable tabs, badges...")]
 [assembly: System.Reflection.AssemblyCompany("Sharpnado")]
 [assembly: System.Reflection.AssemblyProduct("Tabs")]
-[assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2020")]
-[assembly: System.Reflection.AssemblyFileVersion("2.0.1")]
-[assembly: System.Reflection.AssemblyVersion("2.0.1")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")]
+[assembly: System.Reflection.AssemblyFileVersion("2.2.0")]
+[assembly: System.Reflection.AssemblyVersion("2.2.0")]
 [assembly: System.Reflection.AssemblyTitle("Sharpnado.Tabs.UWP")]
 
 
diff --git a/Tabs/Tabs.iOS/AssemblyInfo.cs b/Tabs/Tabs.iOS/AssemblyInfo.cs
index d367f20..2420223 100644
--- a/Tabs/Tabs.iOS/AssemblyInfo.cs
+++ b/Tabs/Tabs.iOS/AssemblyInfo.cs
@@ -1,20 +1,20 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, unde" +
-    "rlined tabs, scrollable tabs, badges...")]
+[assembly: System.Reflection.AssemblyDescription("\"Pure\" Xamarin.Forms Tabs (no renderers). Segmented control, bottombar tabs, mate" +
+    "rial tabs, underlined tabs, scrollable tabs, badges...")]
 [assembly: System.Reflection.AssemblyCompany("Sharpnado")]
 [assembly: System.Reflection.AssemblyProduct("Tabs")]
 [assembly: System.Reflection.AssemblyCopyright("Copyright © Sharpnado 2021")]
-[assembly: System.Reflection.AssemblyFileVersion("2.1.0")]
-[assembly: System.Reflection.AssemblyVersion("2.1.0")]
+[assembly: System.Reflection.AssemblyFileVersion("2.2.0")]
+[assembly: System.Reflection.AssemblyVersion("2.2.0")]
 [assembly: System.Reflection.AssemblyTitle("Sharpnado.Tabs.iOS")]
 
 
diff --git a/Tabs/Tabs/AssemblyInfo.cs b/Tabs/Tabs/AssemblyInfo.cs
index 9b4169d..57c3d62 100644
--- a/Tabs/Tabs/AssemblyInfo.cs
+++ b/Tabs/Tabs/AssemblyInfo.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Ce code a été généré par un outil.
+//     Version du runtime :4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
+//     le code est régénéré.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
diff --git a/Tabs/Tabs/MaterialUnderlinedTabItem.xaml.cs b/Tabs/Tabs/MaterialUnderlinedTabItem.xaml.cs
index f599b2a..1a50957 100644
--- a/Tabs/Tabs/MaterialUnderlinedTabItem.xaml.cs
+++ b/Tabs/Tabs/MaterialUnderlinedTabItem.xaml.cs
@@ -176,7 +176,7 @@ private void ToggleIconVisibility(bool visible)
 
         private void UpdateGeometryIcon()
         {
-            var brush = IsSelected ? SelectedTabColor : UnselectedLabelColor;
+            var brush = new SolidColorBrush(IsSelected ? SelectedTabColor : UnselectedLabelColor);
             if (Fill)
             {
                 IconPath.Fill = brush;
diff --git a/make-package.ps1 b/make-package.ps1
index e30c588..ba8596d 100644
--- a/make-package.ps1
+++ b/make-package.ps1
@@ -1,4 +1,4 @@
-$formsVersion = "4.7.0.968"
+$formsVersion = "5.0.0.1874"
 
 $orgName = "Sharpnado"
 $projectName = "Tabs"