diff --git a/Dalamud/Data/DataManager.cs b/Dalamud/Data/DataManager.cs
index 5c5622295..edc46ac23 100644
--- a/Dalamud/Data/DataManager.cs
+++ b/Dalamud/Data/DataManager.cs
@@ -142,7 +142,7 @@ namespace Dalamud.Data
         /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
         public TexFile GetIcon(int iconId)
         {
-            return GetIcon(string.Empty, iconId);
+            return GetIcon(this.language, iconId);
         }
 
         /// <summary>
@@ -151,11 +151,17 @@ namespace Dalamud.Data
         /// <param name="iconLanguage">The requested language.</param>
         /// <param name="iconId">The icon ID.</param>
         /// <returns>The <see cref="TexFile"/> containing the icon.</returns>
-        public TexFile GetIcon(Language iconLanguage, int iconId)
+        public TexFile GetIcon(ClientLanguage iconLanguage, int iconId)
         {
-            var type = iconLanguage.GetCode();
-            if (type.Length > 0)
-                type += "/";
+            var type = iconLanguage switch {
+                ClientLanguage.Japanese => "ja/",
+                ClientLanguage.English => "en/",
+                ClientLanguage.German => "de/",
+                ClientLanguage.French => "fr/",
+                _ => throw new ArgumentOutOfRangeException(nameof(this.language),
+                                                           "Unknown Language: " + this.language)
+            };
+
             return GetIcon(type, iconId);
         }
 
diff --git a/Dalamud/Data/LuminaExtensions/LanguageExtensions.cs b/Dalamud/Data/LuminaExtensions/LanguageExtensions.cs
deleted file mode 100644
index 3a4583643..000000000
--- a/Dalamud/Data/LuminaExtensions/LanguageExtensions.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Collections.Generic;
-using Lumina.Data;
-
-namespace Dalamud.Data.LuminaExtensions
-{
-    /// <summary>
-    /// Extensions to <see cref="Language"/>.
-    /// </summary>
-    public static class LanguageExtensions
-    {
-        private static readonly Dictionary<Language, string> LangToCode = new Dictionary<Language, string>()
-        {
-            { Language.None, "" },
-            { Language.Japanese, "ja" },
-            { Language.English, "en" },
-            { Language.German, "de" },
-            { Language.French, "fr" },
-            { Language.ChineseSimplified, "chs" },
-            { Language.ChineseTraditional, "cht" },
-            { Language.Korean, "ko" },
-        };
-
-        /// <summary>
-        /// Return the language code for a <see cref="Language"/>.
-        /// </summary>
-        /// <param name="language">The Language.</param>
-        /// <returns>The language code.</returns>
-        public static string GetCode(this Language language)
-        {
-            return LangToCode[language];
-        }
-    }
-}