diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc
index adaf2dcc..b0d77bf2 100644
--- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc
+++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag.toc
@@ -1,6 +1,6 @@
 ## Interface: 30403
 ## Author: Blinkii
-## Version: 3.57
+## Version: 3.58
 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
 ## Notes: mMediaTag & Tools is a plugin for ElvUI. mMediaTag adds many media files like textures/ fonts/ icons and some tools to ElvUI.
 ## Notes-deDE: mMediaTag & Tools ist ein Plugin für ElvUI. mMediaTag fügt viele Mediendateien wie Texturen/ Schriften/ Symbole und einige Tools zu ElvUI hinzu.
diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc
index 4c0ba557..90e37f03 100644
--- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc
+++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Cata.toc
@@ -1,6 +1,6 @@
 ## Interface: 40400
 ## Author: Blinkii
-## Version: 3.57
+## Version: 3.58
 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
 ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon
 ## AddonCompartmentFunc: ElvUI_mMediaTag_OnAddonCompartmentClick
diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc
index e80862d0..aa53fae7 100644
--- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc
+++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Mainline.toc
@@ -1,6 +1,6 @@
 ## Interface: 110002, 110005
 ## Author: Blinkii
-## Version: 3.57
+## Version: 3.58
 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
 ## Notes: ElvUI Plugin from Blinkii | Support: mMediaTag@gmx.de
 ## IconTexture: Interface\AddOns\ElvUI_mMediaTag\media\logo\mmt_icon
diff --git a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc
index d7e51bcb..dd6bc8d0 100644
--- a/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc
+++ b/Addon/ElvUI_mMediaTag/ElvUI_mMediaTag_Vanilla.toc
@@ -1,6 +1,6 @@
 ## Interface: 11503
 ## Author: Blinkii
-## Version: 3.57
+## Version: 3.58
 ## Title: |CFF6559F1m|r|CFFA037E9M|r|CFFDD14E0T|r - |CFF6559F1m|r|CFF7A4DEFM|r|CFF8845ECe|r|CFFA037E9d|r|CFFA435E8i|r|CFFB32DE6a|r|CFFBC26E5T|r|CFFCB1EE3a|r|CFFDD14E0g|r |CFFFF006C&|r |CFFFF4C00T|r|CFFFF7300o|r|CFFFF9300o|r|CFFFFA800l|r|CFFFFC900s|r
 ## Notes: mMediaTag & Tools is a plugin for ElvUI. mMediaTag adds many media files like textures/ fonts/ icons and some tools to ElvUI.
 ## Notes-deDE: mMediaTag & Tools ist ein Plugin für ElvUI. mMediaTag fügt viele Mediendateien wie Texturen/ Schriften/ Symbole und einige Tools zu ElvUI hinzu.
diff --git a/Addon/ElvUI_mMediaTag/core/changelog/3.58.lua b/Addon/ElvUI_mMediaTag/core/changelog/3.58.lua
new file mode 100644
index 00000000..a62bf00a
--- /dev/null
+++ b/Addon/ElvUI_mMediaTag/core/changelog/3.58.lua
@@ -0,0 +1,7 @@
+mMT.Changelog[358]  = {
+	DATE = "11.09.2024",
+	NEW = {
+		"[Portraits]: Add a function to add your custom Class Icons to the portraits via code.",
+		"[Portraits]: Add e Set of new Class Icons.",
+	},
+}
diff --git a/Addon/ElvUI_mMediaTag/core/changelog/load_changelogs.xml b/Addon/ElvUI_mMediaTag/core/changelog/load_changelogs.xml
index dcfabc16..c31a15ad 100644
--- a/Addon/ElvUI_mMediaTag/core/changelog/load_changelogs.xml
+++ b/Addon/ElvUI_mMediaTag/core/changelog/load_changelogs.xml
@@ -12,4 +12,5 @@
     <Script file="3.55.lua"/>
     <Script file="3.56.lua"/>
     <Script file="3.57.lua"/>
+    <Script file="3.58.lua"/>
 </Ui>
diff --git a/Addon/ElvUI_mMediaTag/core/changelog/new.lua b/Addon/ElvUI_mMediaTag/core/changelog/new.lua
index 13cbc06c..55410ca0 100644
--- a/Addon/ElvUI_mMediaTag/core/changelog/new.lua
+++ b/Addon/ElvUI_mMediaTag/core/changelog/new.lua
@@ -1,7 +1,7 @@
 mMT.Changelog[356]  = {
-	DATE = "xx",
-	IMPORTANT = { "xx" },
-	NEW = { "xx" },
-	UPDATE = { "xx" },
-	FIX = { "xx" },
+	DATE = "there is nothing new here",
+	IMPORTANT = { "there is nothing new here" },
+	NEW = { "there is nothing new here" },
+	UPDATE = { "there is nothing new here" },
+	FIX = { "there is nothing new here" },
 }
diff --git a/Addon/ElvUI_mMediaTag/core/load_core.xml b/Addon/ElvUI_mMediaTag/core/load_core.xml
index f2e41b95..0bfbe046 100644
--- a/Addon/ElvUI_mMediaTag/core/load_core.xml
+++ b/Addon/ElvUI_mMediaTag/core/load_core.xml
@@ -3,7 +3,7 @@
 	<Include file="changelog\load_changelogs.xml"/>
 	<Script file="Core.lua"/>
 	<Script file="eltruism.lua"/>
-	<Script file="jiberish.lua"/>
+	<!-- <Script file="jiberish.lua"/> -->
 	<Script file="merathilis.lua"/>
 	<Script file="cmd.lua"/>
 	<Script file="devmode.lua"/>
diff --git a/Addon/ElvUI_mMediaTag/core/options/portraits.lua b/Addon/ElvUI_mMediaTag/core/options/portraits.lua
index dd42d60f..7d7435d9 100644
--- a/Addon/ElvUI_mMediaTag/core/options/portraits.lua
+++ b/Addon/ElvUI_mMediaTag/core/options/portraits.lua
@@ -58,15 +58,18 @@ local frameStrata = {
 }
 
 function BuildIconStylesTable()
-	for id, name in pairs(mMT.ElvUI_JiberishIcons.styles) do
-		ClassIconStyle[id] = name
+	-- for id, name in pairs(mMT.ElvUI_JiberishIcons.styles) do
+	-- 	ClassIconStyle[id] = name
+	-- end
+	for iconStyle, value in pairs(mMT.classIcons) do
+		ClassIconStyle[iconStyle] = value.name
 	end
 end
 
 local function configTable()
 	local sizeString = ":16:16:0:0:64:64:4:60:4:60"
 
-	if mMT.ElvUI_JiberishIcons.loaded then BuildIconStylesTable() end
+	BuildIconStylesTable()
 
 	E.Options.args.mMT.args.unitframes.args.portraits.args = {
 		toggle_enable = {
@@ -123,6 +126,7 @@ local function configTable()
 									end,
 									set = function(info, value)
 										E.db.mMT.portraits.general.classiconstyle = value
+										mMT.Modules.Portraits:Initialize()
 										E:StaticPopup_Show("CONFIG_RL")
 									end,
 									values = ClassIconStyle,
diff --git a/Addon/ElvUI_mMediaTag/init.lua b/Addon/ElvUI_mMediaTag/init.lua
index e21057ef..bb70ea10 100644
--- a/Addon/ElvUI_mMediaTag/init.lua
+++ b/Addon/ElvUI_mMediaTag/init.lua
@@ -28,7 +28,7 @@ mMT.DB = {}
 mMT.ClassColor = {}
 mMT.ElvUI_EltreumUI = {}
 mMT.ElvUI_MerathilisUI = {}
-mMT.ElvUI_JiberishIcons = {}
+--mMT.ElvUI_JiberishIcons = {}
 mMT.DEVNames = {}
 mMT.DevMode = false
 mMT.CurrentProfile = nil
@@ -36,6 +36,7 @@ mMT.firstLoad = 0
 mMT.Classes = { "DEATHKNIGHT", "DEMONHUNTER", "DRUID", "EVOKER", "HUNTER", "MAGE", "MONK", "PALADIN", "PRIEST", "ROGUE", "SHAMAN", "WARLOCK", "WARRIOR" }
 mMT.Locales = LibStub("AceLocale-3.0"):GetLocale("mMediaTag")
 mMT.Changelog = {}
+mMT.classIcons = {}
 mMT.BossIDs = {}
 
 mMT.Modules.Portraits = {}
@@ -209,7 +210,7 @@ function mMT:Initialize()
 	mMT.Classes = mMT:ClassesTable()
 
 	-- load JiberishUI Icons for Portraits
-	if E.db.mMT.portraits.general.enable then mMT.ElvUI_JiberishIcons = mMT:JiberishIcons() end
+	--if E.db.mMT.portraits.general.enable then mMT.ElvUI_JiberishIcons = mMT:JiberishIcons() end
 
 	-- Register Events for Retail
 	if E.Retail or E.Cata then
@@ -276,7 +277,7 @@ function mMT:PLAYER_ENTERING_WORLD(event)
 	mMT.ElvUI_EltreumUI = mMT:CheckEltruism()
 	mMT.ElvUI_MerathilisUI = mMT:CheckMerathilisUI()
 	mMT.ClassColor = mMT:UpdateClassColor()
-	mMT.ElvUI_JiberishIcons = mMT:JiberishIcons()
+	--mMT.ElvUI_JiberishIcons = mMT:JiberishIcons()
 	mMT.DEVNames = mMT:GetDevNames()
 	mMT.Classes = mMT:ClassesTable()
 
diff --git a/Addon/ElvUI_mMediaTag/localization/deDE.lua b/Addon/ElvUI_mMediaTag/localization/deDE.lua
index abfbf2a2..e05df8b4 100644
--- a/Addon/ElvUI_mMediaTag/localization/deDE.lua
+++ b/Addon/ElvUI_mMediaTag/localization/deDE.lua
@@ -707,6 +707,7 @@ L["Use Class Icons"] = "Benutze Klassensymbole"
 L["Use Default NPC IDs"] = "Benutze Standard NPC IDs"
 L["Use Eltruism colors"] = "Benutze Eltruism Farben"
 L["Use MerathilisUI colors"] = "Benutze MerathilisUI Farben"
+L["Use Texture Color"] = "Verwende Texturfarbe"
 L["Use only Default Color"] = "Nur die Standardfarbe verwenden"
 L["Uses Custom and default NPC IDs"] = "Verwende eigene und Standard NPC IDs"
 L["Uses for every Unit the Default Color."] = "Verwendet für jede Einheit die Standardfarbe."
@@ -724,6 +725,7 @@ L["Weekly Affixes"] = "Wöchentliche Affixe"
 L["Weekly Score"] = "Wöchentliche Punkte"
 L["Welcome text"] = "Willkommensnachricht"
 L["Welcome to %s %s version |CFFF7DC6F%s|r, type |CFF58D68D/mmt|r to access the in-game configuration menu."] = "Willkommen zu %s %s Version |CFFF7DC6F%s|r, tippe |CFF58D68D/mmt|r um das Einstellungs Fenster zu öffnen."
+L["When loading the textures of JiberishUI icons."] = "Beim Laden der Texturen von JiberishUI-Symbolen."
 L["White"] = "weiß"
 L["WoW Token:"] = "WoW Marke:"
 L["World Latency:"] = "Weltlatenz"
@@ -748,6 +750,7 @@ L["mMT Extra"] = true
 L["mMT Raidtarget marker Icons"] = "mMT Raidziel Markierungssymbole"
 L["mMT XIV Like Color"] = "mMT XIV ähnlich in Farbe"
 L["mMT XIV Like"] = "mMT XIV ähnlich"
+L["mMediaTag needs an update to support the current version of JiberishUI icons, it is possible that the class icons are not displayed correctly on the portraits."] = "mMediaTag benötigt ein Update, um die aktuelle Version der JiberishUI-Symbole zu unterstützen. Es ist möglich, dass die Klassensymbole auf den Porträts nicht richtig angezeigt werden."
 L["middle click to open the Dungeon Teleports menu."] = "Mittel Klick um das Instanzteleporter Menü zu öffnen."
 L["no Status version of"] = "Kein Status Version von"
 L["right click to open Great Vault Window"] = "Rechts Klick um die Große Schatzkammer zu öffnen."
@@ -766,8 +769,3 @@ L["|cffFFFFFFControl + Left Click:|r Change Loadout"] = "|cffFFFFFFStrg + Linksk
 L["|cffFFFFFFLeft Click:|r Change Talent Specialization"] = "|cffFFFFFFLinks Klick:|r Talent Spezialisierung ändern"
 L["|cffFFFFFFRight Click:|r Change Loot Specialization"] = "|cffFFFFFFRechtsklick:|r Beutespezialisierung ändern"
 L["|cffFFFFFFShift + Left Click:|r Show Talent Specialization UI"] = "|cffFFFFFFShift + Links Klick:|r Zeige Talent Spezialisierungs Interface"
-
--- new
-L["Use Texture Color"] = true
-L["mMediaTag needs an update to support the current version of JiberishUI icons, it is possible that the class icons are not displayed correctly on the portraits."] = true
-L["When loading the textures of JiberishUI icons."] = true
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_border.tga b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_border.tga
new file mode 100644
index 00000000..adddc86b
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_border.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_classcolored_border.tga b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_classcolored_border.tga
new file mode 100644
index 00000000..7eee0ca4
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_classcolored_border.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent.tga b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent.tga
new file mode 100644
index 00000000..229fe177
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_colorboost.tga b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_colorboost.tga
new file mode 100644
index 00000000..2dca5235
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_colorboost.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_colorboost_shadow.tga b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_colorboost_shadow.tga
new file mode 100644
index 00000000..7b60089c
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_colorboost_shadow.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline.tga b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline.tga
new file mode 100644
index 00000000..8ca11074
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline_colorboost.tga b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline_colorboost.tga
new file mode 100644
index 00000000..890cbe2b
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline_colorboost.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline_shadow.tga b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline_shadow.tga
new file mode 100644
index 00000000..4dbfd1fc
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline_shadow.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline_shadow_colorboost.tga b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline_shadow_colorboost.tga
new file mode 100644
index 00000000..88a094fd
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_outline_shadow_colorboost.tga differ
diff --git a/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_shadow.tga b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_shadow.tga
new file mode 100644
index 00000000..90ea1fbc
Binary files /dev/null and b/Addon/ElvUI_mMediaTag/media/portraits/class/mmt_transparent_shadow.tga differ
diff --git a/Addon/ElvUI_mMediaTag/modules/unitframes/classicons.lua b/Addon/ElvUI_mMediaTag/modules/unitframes/classicons.lua
new file mode 100644
index 00000000..626974cc
--- /dev/null
+++ b/Addon/ElvUI_mMediaTag/modules/unitframes/classicons.lua
@@ -0,0 +1,52 @@
+local L = mMT.Locales
+
+local type = type
+local path = "Interface\\Addons\\ElvUI_mMediaTag\\media\\portraits\\class\\"
+local textureCoords = {
+	WARRIOR = { 0, 0, 0, 0.125, 0.125, 0, 0.125, 0.125 },
+	MAGE = { 0.125, 0, 0.125, 0.125, 0.25, 0, 0.25, 0.125 },
+	ROGUE = { 0.25, 0, 0.25, 0.125, 0.375, 0, 0.375, 0.125 },
+	DRUID = { 0.375, 0, 0.375, 0.125, 0.5, 0, 0.5, 0.125 },
+	EVOKER = { 0.5, 0, 0.5, 0.125, 0.625, 0, 0.625, 0.125 },
+	HUNTER = { 0, 0.125, 0, 0.25, 0.125, 0.125, 0.125, 0.25 },
+	SHAMAN = { 0.125, 0.125, 0.125, 0.25, 0.25, 0.125, 0.25, 0.25 },
+	PRIEST = { 0.25, 0.125, 0.25, 0.25, 0.375, 0.125, 0.375, 0.25 },
+	WARLOCK = { 0.375, 0.125, 0.375, 0.25, 0.5, 0.125, 0.5, 0.25 },
+	PALADIN = { 0, 0.25, 0, 0.375, 0.125, 0.25, 0.125, 0.375 },
+	DEATHKNIGHT = { 0.125, 0.25, 0.125, 0.375, 0.25, 0.25, 0.25, 0.375 },
+	MONK = { 0.25, 0.25, 0.25, 0.375, 0.375, 0.25, 0.375, 0.375 },
+	DEMONHUNTER = { 0.375, 0.25, 0.375, 0.375, 0.5, 0.25, 0.5, 0.375 },
+}
+
+-- style = texture style, textur = path to the texture, table with texture coords for each class, name = optional name to show in dopdown menu
+function mMT:AddClassIcons(style, texture, texCoords, name)
+	if type(texCoords) ~= "table" then
+		mMT:Print("|CFFEA1818Error|r:", L["The texture coordinates must be passed as a table."])
+		return
+	end
+
+	if style and texture and texCoords then
+		mMT.classIcons[style] = {
+            name = name or style,
+			texture = texture,
+			texCoords = texCoords,
+		}
+	else
+		mMT:Print("|CFFEA1818Error|r:", L["Could not add the texture."])
+	end
+end
+
+mMT:AddClassIcons("mmt_border", path .. "mmt_border.tga",  textureCoords, "mMT Frame A")
+mMT:AddClassIcons("mmt_classcolored_border", path .. "mmt_classcolored_border.tga",  textureCoords, "mMT Frame B")
+
+mMT:AddClassIcons("mmt_transparent", path .. "mmt_transparent.tga",  textureCoords, "mMT Transparent A")
+mMT:AddClassIcons("mmt_transparent_shadow", path .. "mmt_transparent_shadow.tga",  textureCoords, "mMT Transparent B")
+mMT:AddClassIcons("mmt_transparent_colorboost", path .. "mmt_transparent_colorboost.tga",  textureCoords, "mMT Transparent C")
+mMT:AddClassIcons("mmt_transparent_colorboost_shadow", path .. "mmt_transparent_colorboost_shadow.tga",  textureCoords, "mMT Transparent D")
+
+mMT:AddClassIcons("mmt_transparent_outline", path .. "mmt_transparent_outline.tga",  textureCoords, "mMT Transparent Outline A")
+mMT:AddClassIcons("mmt_transparent_outline_shadow", path .. "mmt_transparent_outline_shadow.tga",  textureCoords, "mMT Transparent Outline B")
+mMT:AddClassIcons("mmt_transparent_outline_colorboost", path .. "mmt_transparent_outline_colorboost.tga",  textureCoords, "mMT Transparent Outline C")
+mMT:AddClassIcons("mmt_transparent_outline_shadow_colorboost", path .. "mmt_transparent_outline_shadow_colorboost.tga",  textureCoords, "mMT Transparent Outline D")
+
+mMT:AddClassIcons("BLIZZARD", "Interface\\WorldStateFrame\\Icons-Classes",  CLASS_ICON_TCOORDS, "Blizzard")
diff --git a/Addon/ElvUI_mMediaTag/modules/unitframes/load_unitframes.xml b/Addon/ElvUI_mMediaTag/modules/unitframes/load_unitframes.xml
index 62b3eb4b..e3cacb4b 100644
--- a/Addon/ElvUI_mMediaTag/modules/unitframes/load_unitframes.xml
+++ b/Addon/ElvUI_mMediaTag/modules/unitframes/load_unitframes.xml
@@ -1,4 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file="classicons.lua"/>
 	<Script file="background.lua"/>
 	<Script file="RoleIcons.lua"/>
 	<Script file="PhaseIcon.lua"/>
diff --git a/Addon/ElvUI_mMediaTag/modules/unitframes/load_unitframes_classic.xml b/Addon/ElvUI_mMediaTag/modules/unitframes/load_unitframes_classic.xml
index d01d3801..9278d600 100644
--- a/Addon/ElvUI_mMediaTag/modules/unitframes/load_unitframes_classic.xml
+++ b/Addon/ElvUI_mMediaTag/modules/unitframes/load_unitframes_classic.xml
@@ -1,4 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
+	<Script file="classicons.lua"/>
 	<Script file="background.lua"/>
 	<Script file="PhaseIcon.lua"/>
 	<Script file="ReadyCheckIcon.lua"/>
diff --git a/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua b/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua
index 03aeea19..a95607ac 100644
--- a/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua
+++ b/Addon/ElvUI_mMediaTag/modules/unitframes/portrait.lua
@@ -69,7 +69,6 @@ local function setColor(texture, color, mirror)
 	end
 end
 
-
 local cachedFaction = {}
 
 local function getColor(unit, isPlayer)
@@ -126,15 +125,11 @@ end
 local function SetPortraits(frame, unit, masking, mirror)
 	if E.db.mMT.portraits.general.classicons and UnitIsPlayer(unit) then
 		local class = select(2, UnitClass(unit))
-		local coords = CLASS_ICON_TCOORDS[class]
 		local style = E.db.mMT.portraits.general.classiconstyle
+		local coords = mMT.classIcons[style].texCoords[class]
+		local iconTexture = mMT.classIcons[style].texture
 
-		if mMT.ElvUI_JiberishIcons.loaded and style ~= "BLIZZARD" then
-			coords = class and mMT.ElvUI_JiberishIcons.texCoords[class]
-			SetTextures(frame.portrait, mMT.ElvUI_JiberishIcons.path .. style)
-		else
-			SetTextures(frame.portrait, "Interface\\WorldStateFrame\\Icons-Classes")
-		end
+		SetTextures(frame.portrait, iconTexture)
 
 		if frame.iconbg then UpdateIconBackground(frame.iconbg, unit, mirror) end
 
@@ -234,7 +229,6 @@ local function CheckRareElite(frame, unit, unitColor)
 	end
 end
 
-
 local function UpdatePortrait(portraitFrame, force)
 	if mMT.DevMode then
 		mMT:Print(
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a121990..a9414372 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,13 @@
 # Changelog - ElvUI_mMediaTag
 [Eng] - All changes to this project will be documented in this file. The latest changes are at the top.
 
+## [ver. 3.58] - 11.09.2024
+### NEW
+- NEW - [Portraits]: Add a function to add your custom Class Icons to the portraits via code.
+- NEW - [Portraits]: Add e Set of new Class Icons.
+
 ## [ver. 3.57] - 07.09.2024
-## UPDATE
+### UPDATE
 - UPDATE - [Important-Spells]: Default Texture function.
 - UPDATE - [Portraits]: Background setting is now always available.
 - UPDATE - [Portraits]: Optimized Style c and b.
@@ -10,7 +15,7 @@
 ### FIX 
 - FIX - [Portraits]: Smal Bugs with ne Textures.
 - FIX - [Portraits]: Old DB check did not worked correctly.
-## NEW
+### NEW
 - NEW - [Portraits]: Add Rare/ Elite/ Boss to custom Texture section.
 - NEW - [Portraits]: Add simple Dragon texture to Circle, Drop & Pure.
 - NEW - [Portraits]: New color function for Rare/ Elite/ Boss textures.