diff --git a/SAM.Game/Manager.cs b/SAM.Game/Manager.cs
index 715f7e6..1f940f2 100644
--- a/SAM.Game/Manager.cs
+++ b/SAM.Game/Manager.cs
@@ -174,7 +174,7 @@ namespace SAM.Game
             this._IconDownloader.DownloadDataAsync(
                 new Uri(string.Format(
                     CultureInfo.InvariantCulture,
-                    "http://media.steamcommunity.com/steamcommunity/public/images/apps/{0}/{1}",
+                    "http://steamcdn-a.akamaihd.net/steamcommunity/public/images/apps/{0}/{1}",
                     this._GameId,
                     info.IsAchieved == true ? info.IconNormal : info.IconLocked)),
                 info);
diff --git a/SAM.Game/Program.cs b/SAM.Game/Program.cs
index a8bbad6..a5053d5 100644
--- a/SAM.Game/Program.cs
+++ b/SAM.Game/Program.cs
@@ -106,12 +106,6 @@ namespace SAM.Game
                     return;
                 }
 
-                /* Disable server certificate validation.
-                 * This is for media downloads (achievement icons).
-                 * https://media.steamcommunity.com/ has certs issued to (various).e.akamai.net.
-                 */
-                ServicePointManager.ServerCertificateValidationCallback = (s, ce, ch, e) => true;
-
                 Application.EnableVisualStyles();
                 Application.SetCompatibleTextRenderingDefault(false);
                 Application.Run(new Manager(appId, client));
diff --git a/SAM.Picker/GamePicker.cs b/SAM.Picker/GamePicker.cs
index a65c0d0..24e9f7c 100644
--- a/SAM.Picker/GamePicker.cs
+++ b/SAM.Picker/GamePicker.cs
@@ -229,7 +229,7 @@ namespace SAM.Picker
             var info = (GameInfo)e.Argument;
             var logoPath = string.Format(
                 CultureInfo.InvariantCulture,
-                "https://media.steamcommunity.com/steamcommunity/public/images/apps/{0}/{1}.jpg",
+                "https://steamcdn-a.akamaihd.net/steamcommunity/public/images/apps/{0}/{1}.jpg",
                 info.Id,
                 info.Logo);
             using (var downloader = new WebClient())
diff --git a/SAM.Picker/Program.cs b/SAM.Picker/Program.cs
index ef69e63..8241cc6 100644
--- a/SAM.Picker/Program.cs
+++ b/SAM.Picker/Program.cs
@@ -87,12 +87,6 @@ namespace SAM.Picker
                     return;
                 }
 
-                /* Disable server certificate validation.
-                 * This is for media downloads (application logos).
-                 * https://media.steamcommunity.com/ has certs issued to (various).e.akamai.net.
-                 */
-                ServicePointManager.ServerCertificateValidationCallback = (s, ce, ch, e) => true;
-
                 Application.EnableVisualStyles();
                 Application.SetCompatibleTextRenderingDefault(false);
                 Application.Run(new GamePicker(client));