diff --git a/api/config.lua b/api/config.lua
index 5daf0397..bd6d94ed 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -825,6 +825,7 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("nameplates", nil,           "friendclassc",     "1")
   pfUI:UpdateConfig("nameplates", nil,           "friendclassnamec", "0")
   pfUI:UpdateConfig("nameplates", nil,           "raidiconsize",     "16")
+  pfUI:UpdateConfig("unitframes",  nil,           "blizzard_raidicons","1")
   pfUI:UpdateConfig("nameplates", nil,           "raidiconpos",      "CENTER")
   pfUI:UpdateConfig("nameplates", nil,           "raidiconoffx",     "0")
   pfUI:UpdateConfig("nameplates", nil,           "raidiconoffy",     "-5")
diff --git a/api/unitframes.lua b/api/unitframes.lua
index 081f74bd..53120797 100644
--- a/api/unitframes.lua
+++ b/api/unitframes.lua
@@ -924,7 +924,8 @@ function pfUI.uf:UpdateConfig()
   f.raidIcon:SetWidth(f.config.raidiconsize)
   f.raidIcon:SetHeight(f.config.raidiconsize)
   f.raidIcon:SetPoint("CENTER", f, f.config.raidiconalign, f.config.raidiconoffx, f.config.raidiconoffy)
-  f.raidIcon.texture:SetTexture("Interface\\TargetingFrame\\UI-RaidTargetingIcons")
+  local raidIconTex = C.unitframes.blizzard_raidicons == "1" and "Interface\\TargetingFrame\\UI-RaidTargetingIcons" or pfUI.media["img:raidicons"]
+  f.raidIcon.texture:SetTexture(raidIconTex)
   f.raidIcon.texture:SetAllPoints(f.raidIcon)
   f.raidIcon:Hide()
 
diff --git a/modules/gui.lua b/modules/gui.lua
index ef4747b3..0a3df233 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -2076,6 +2076,7 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
       CreateConfig(nil, T["Enable Energy Ticks"], C.unitframes.player, "energy", "checkbox")
       CreateConfig(nil, T["Enable Mana Ticks"], C.unitframes.player, "manatick", "checkbox")
       CreateConfig(nil, T["Detect Enemy Buffs"], C.unitframes, "buffdetect", "checkbox", nil, nil, nil, nil, "vanilla" )
+      CreateConfig(nil, T["Raid Mark Icon Style"], C.unitframes, "blizzard_raidicons", "dropdown", function() return {"1:Original Blizzard", "0:pfUI Design"} end)
 
       CreateConfig(nil, T["Swing Timer"], nil, nil, "header")
       CreateConfig(nil, T["Swing Timer Width"], C.unitframes, "swingtimerwidth")
diff --git a/modules/marktracking.lua b/modules/marktracking.lua
index 71a28173..3e0a7ea3 100644
--- a/modules/marktracking.lua
+++ b/modules/marktracking.lua
@@ -140,7 +140,8 @@ pfUI.marktracking = CreateFrame("Frame", "pfMarkTracking", UIParent)
     row.icon:SetWidth(ROW_HEIGHT)
     row.icon:SetHeight(ROW_HEIGHT)
     row.icon:SetPoint("LEFT", row, "LEFT", 1, 0)
-    row.icon:SetTexture("Interface\\TargetingFrame\\UI-RaidTargetingIcons")
+    local markTex = C.unitframes.blizzard_raidicons == "1" and "Interface\\TargetingFrame\\UI-RaidTargetingIcons" or pfUI.media["img:raidicons"]
+    row.icon:SetTexture(markTex)
     SetRaidTargetIconTexture(row.icon, i)
 
     -- portrait (right side)
diff --git a/modules/nameplates.lua b/modules/nameplates.lua
index 4f5d2141..c60b52ce 100644
--- a/modules/nameplates.lua
+++ b/modules/nameplates.lua
@@ -753,6 +753,9 @@ nameplates:RegisterEvent("ZONE_CHANGED_NEW_AREA")
 
     nameplate.raidicon:SetParent(plate)
     nameplate.raidicon:SetDrawLayer("OVERLAY")
+    if C.unitframes.blizzard_raidicons ~= "1" then
+      nameplate.raidicon:SetTexture(pfUI.media["img:raidicons"])
+    end
 
     nameplate.totem = CreateFrame("Frame", nil, nameplate)
     nameplate.totem:SetPoint("CENTER", nameplate, "CENTER", 0, 0)