diff --git a/PoGo.NecroBot.Window/Controls/MapMarkers/MapPokemonMarker.xaml b/PoGo.NecroBot.Window/Controls/MapMarkers/MapPokemonMarker.xaml
index 80e4e59ce..9b70d38a9 100644
--- a/PoGo.NecroBot.Window/Controls/MapMarkers/MapPokemonMarker.xaml
+++ b/PoGo.NecroBot.Window/Controls/MapMarkers/MapPokemonMarker.xaml
@@ -6,7 +6,7 @@
     <Grid>
         <Button Background="Transparent" BorderThickness="0">
             <Image Name="icon" 
-               Source="{Binding Path=PokemonIcon, FallbackValue=https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/0.png}"
+               Source="{Binding Path=PokemonIcon, FallbackValue=https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/0.png}"
                VerticalAlignment="Center" 
                HorizontalAlignment="Center" 
                IsHitTestVisible="false" 
diff --git a/PoGo.NecroBot.Window/Controls/MapMarkers/PlayerMarker.xaml b/PoGo.NecroBot.Window/Controls/MapMarkers/PlayerMarker.xaml
index 43c35dabe..37c74afa3 100644
--- a/PoGo.NecroBot.Window/Controls/MapMarkers/PlayerMarker.xaml
+++ b/PoGo.NecroBot.Window/Controls/MapMarkers/PlayerMarker.xaml
@@ -3,5 +3,5 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	x:Class="PoGo.NecroBot.Window.Controls.MapMarkers.PlayerMarker"
 	Height="40" Width="40" Opacity="10">
-		<Image Name="icon" Source="https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/markers/location.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
+		<Image Name="icon" Source="https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/markers/location.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
 </UserControl>
\ No newline at end of file
diff --git a/PoGo.NecroBot.Window/Controls/Sidebars/CatchPokemonItem.xaml b/PoGo.NecroBot.Window/Controls/Sidebars/CatchPokemonItem.xaml
index c37a19310..ab5453c43 100644
--- a/PoGo.NecroBot.Window/Controls/Sidebars/CatchPokemonItem.xaml
+++ b/PoGo.NecroBot.Window/Controls/Sidebars/CatchPokemonItem.xaml
@@ -38,19 +38,19 @@
 
                     <StackPanel  Orientation="Horizontal">
                         <StackPanel  Visibility="{Binding PokeBalls, Converter={ StaticResource CollapseWhenGreateThenZeroConverter}}" Orientation="Horizontal">
-                            <Image  Source="https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/items/1.png" Width="25"></Image>
+                            <Image  Source="https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/items/1.png" Width="25"></Image>
                             <TextBlock Margin="3,5,0,0" Text="{Binding PokeBalls, StringFormat={}x{0}}"></TextBlock>
                         </StackPanel>
                         <StackPanel  Visibility="{Binding   Path=GreatBalls, Converter={ StaticResource CollapseWhenGreateThenZeroConverter}}" Orientation="Horizontal">
-                            <Image  Source="https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/items/2.png" Width="25"></Image>
+                            <Image  Source="https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/items/2.png" Width="25"></Image>
                             <TextBlock Margin="3,5,0,0" Text="{Binding GreatBalls, StringFormat={}x{0}}"></TextBlock>
                         </StackPanel>
                         <StackPanel  Visibility="{Binding Path=UltraBalls, Converter={ StaticResource CollapseWhenGreateThenZeroConverter}}" Orientation="Horizontal">
-                            <Image  Source="https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/items/3.png" Width="25"></Image>
+                            <Image  Source="https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/items/3.png" Width="25"></Image>
                             <TextBlock Margin="3,5,0,0" Text="{Binding Path=UltraBalls, StringFormat={}x{0}}"></TextBlock>
                         </StackPanel>
                         <StackPanel  Visibility="{Binding Path=MasterBalls, Converter={ StaticResource CollapseWhenGreateThenZeroConverter}}" Orientation="Horizontal">
-                            <Image  Source="https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/items/4.png" Width="25"></Image>
+                            <Image  Source="https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/items/4.png" Width="25"></Image>
                             <TextBlock Margin="3,5,0,0" Text="{Binding Path=MasterBalls, StringFormat={}x{0}}"></TextBlock>
                         </StackPanel>
                     </StackPanel>
diff --git a/PoGo.NecroBot.Window/Converters/ItemIdToImageConverter.cs b/PoGo.NecroBot.Window/Converters/ItemIdToImageConverter.cs
index a41d20c62..700f085b4 100644
--- a/PoGo.NecroBot.Window/Converters/ItemIdToImageConverter.cs
+++ b/PoGo.NecroBot.Window/Converters/ItemIdToImageConverter.cs
@@ -10,7 +10,7 @@ public class ItemIdToImageConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             ItemId itemId = (ItemId)Enum.Parse(typeof(ItemId), value.ToString());
-            return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/items/{(int)itemId}.png";
+            return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/items/{(int)itemId}.png";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/PoGo.NecroBot.Window/Converters/PokemonIdToImageConverter.cs b/PoGo.NecroBot.Window/Converters/PokemonIdToImageConverter.cs
index 03ba151a3..b9148d37e 100644
--- a/PoGo.NecroBot.Window/Converters/PokemonIdToImageConverter.cs
+++ b/PoGo.NecroBot.Window/Converters/PokemonIdToImageConverter.cs
@@ -11,7 +11,7 @@ public class PokemonIdToImageConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             PokemonId pokemonId = (PokemonId)Enum.Parse(typeof(PokemonId), value.ToString());
-            return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/{(int)pokemonId}.png";
+            return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/{(int)pokemonId}.png";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/PoGo.NecroBot.Window/Converters/PokemonImageConverter.cs b/PoGo.NecroBot.Window/Converters/PokemonImageConverter.cs
index ae9df3c66..a129afccc 100644
--- a/PoGo.NecroBot.Window/Converters/PokemonImageConverter.cs
+++ b/PoGo.NecroBot.Window/Converters/PokemonImageConverter.cs
@@ -10,7 +10,7 @@ public class PokemonImageConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             PokemonId pokemonId = (PokemonId)Enum.Parse(typeof(PokemonId), value.ToString());
-            return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/{(int)pokemonId}.png";
+            return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/{(int)pokemonId}.png";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/PoGo.NecroBot.Window/Model/FortViewModel.cs b/PoGo.NecroBot.Window/Model/FortViewModel.cs
index 439c45455..86302e76b 100644
--- a/PoGo.NecroBot.Window/Model/FortViewModel.cs
+++ b/PoGo.NecroBot.Window/Model/FortViewModel.cs
@@ -43,16 +43,16 @@ public string FortIcon
                 if (fort.LureInfo != null)
                 {
                     if (fort.CooldownCompleteTimestampMs < DateTime.UtcNow.ToUnixTime())
-                        fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/markers/Lured.png";
+                        fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/markers/Lured.png";
                     else
-                        fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/markers/VisitedLure.png";
+                        fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/markers/VisitedLure.png";
                 }
                 else
                 {
                     if (fort.CooldownCompleteTimestampMs < DateTime.UtcNow.ToUnixTime())
-                        fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/markers/Normal.png";
+                        fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/markers/Normal.png";
                     else
-                        fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/markers/Visited.png";
+                        fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/markers/Visited.png";
                 }
                 return fortIcon;
             }
diff --git a/PoGo.NecroBot.Window/Model/GymViewModel.cs b/PoGo.NecroBot.Window/Model/GymViewModel.cs
index 5f0852731..392eb31b0 100644
--- a/PoGo.NecroBot.Window/Model/GymViewModel.cs
+++ b/PoGo.NecroBot.Window/Model/GymViewModel.cs
@@ -121,16 +121,16 @@ public string TeamIcon
                 switch (fort.OwnedByTeam)
                 {
                     case TeamColor.Neutral:
-                        fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/gui/unoccupied.png";
+                        fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/gui/unoccupied.png";
                         break;
                     case TeamColor.Blue:
-                        fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/gui/mystic.png";
+                        fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/gui/mystic.png";
                         break;
                     case TeamColor.Red:
-                        fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/gui/valor.png";
+                        fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/gui/valor.png";
                         break;
                     case TeamColor.Yellow:
-                        fortIcon = "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/NecroEase/gui/instinct.png";
+                        fortIcon = "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/NecroEase/gui/instinct.png";
                         break;
                 }
                 return fortIcon;
diff --git a/PoGo.NecroBot.Window/Model/IncubatorViewModel.cs b/PoGo.NecroBot.Window/Model/IncubatorViewModel.cs
index b6bbe11a0..bfd8bca8c 100644
--- a/PoGo.NecroBot.Window/Model/IncubatorViewModel.cs
+++ b/PoGo.NecroBot.Window/Model/IncubatorViewModel.cs
@@ -17,7 +17,7 @@ public IncubatorViewModel(EggIncubator incu)
             IsUnlimited = incu.ItemId == POGOProtos.Inventory.Item.ItemId.ItemIncubatorBasicUnlimited;
 
         }
-        public string Icon => "https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/eggs/egg_incubator.png";
+        public string Icon => "https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/eggs/egg_incubator.png";
         public double Availbility => InUse ? 0 : 1;
 
         public string Id { get;  set; }
diff --git a/PoGo.NecroBot.Window/Model/PokemonDataViewModel.cs b/PoGo.NecroBot.Window/Model/PokemonDataViewModel.cs
index 598aeb2f0..49286eedb 100644
--- a/PoGo.NecroBot.Window/Model/PokemonDataViewModel.cs
+++ b/PoGo.NecroBot.Window/Model/PokemonDataViewModel.cs
@@ -316,14 +316,14 @@ public string PokemonIcon
             {
 
                 if (Slashed)
-                    return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/slashed.png";
+                    return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/slashed.png";
                 else
                 {
                     var additional = "";
                     additional = additional + ("-" + pokemonData.PokemonDisplay.Costume.ToString()).Replace("-Unset", "");
                     additional = additional + ("-" + pokemonData.PokemonDisplay.Form.ToString().Replace("Unown", "").Replace("-ExclamationPoint", "-ExclamationPoint").Replace("-QuestionMark", "-QuestionMark")).Replace("-Unset", "");
                     additional += pokemonData.PokemonDisplay.Shiny ? "-shiny" : "";
-                    return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/{(int)PokemonData.PokemonId}{additional}.png";
+                    return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/{(int)PokemonData.PokemonId}{additional}.png";
                 }
             }
         }
diff --git a/PoGo.NecroBot.Window/Model/PokemonViewModelBase.cs b/PoGo.NecroBot.Window/Model/PokemonViewModelBase.cs
index 524a042eb..366400bc5 100644
--- a/PoGo.NecroBot.Window/Model/PokemonViewModelBase.cs
+++ b/PoGo.NecroBot.Window/Model/PokemonViewModelBase.cs
@@ -15,7 +15,7 @@ public string PokemonIcon
         {
             get
             {
-                return $"https://cdn.rawgit.com/NecroBot-Private/PokemonGO-Assets/master/pokemon/{(int)PokemonId}.png";
+                return $"https://cdn.jsdelivr.net/gh/NecroBot-Private/PokemonGO-Assets@master/pokemon/{(int)PokemonId}.png";
             }
         }